From 596e88126d5305765dec297a9e2d3668430fb42c Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Wed, 20 Jul 2016 09:58:55 +0100 Subject: [PATCH] Rename activiti component and add demo folder --- .../components/tasks/tasks-demo.component.ts | 2 +- demo-shell-ng2/package.json | 2 +- demo-shell-ng2/systemjs.config.js | 4 +- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE | 0 .../README.md | 0 .../assets/license_header.txt | 0 .../ng2-activiti-tasklist/demo/.gitignore | 6 + .../ng2-activiti-tasklist/demo/.npmignore | 3 + .../ng2-activiti-tasklist/demo/README.md | 13 ++ .../ng2-activiti-tasklist/demo/index.html | 34 +++++ .../ng2-activiti-tasklist/demo/package.json | 78 +++++++++++ .../ng2-activiti-tasklist/demo/src/main.ts | 64 +++++++++ .../demo/systemjs.config.js | 57 ++++++++ .../ng2-activiti-tasklist/demo/tsconfig.json | 19 +++ .../ng2-activiti-tasklist/demo/tslint.json | 124 ++++++++++++++++++ .../demo}/typings.json | 0 .../index.ts | 0 .../karma-test-shim.js | 0 .../karma.conf.js | 0 .../package.json | 2 +- .../src/assets/translation.service.mock.ts | 0 .../activiti-tasklist.component.html | 2 +- .../activiti-tasklist.component.spec.ts | 8 +- .../components/activiti-tasklist.component.ts | 7 +- .../src/models/filter.model.ts | 0 .../activiti-tasklist.service.spec.ts | 0 .../src/services/activiti-tasklist.service.ts | 8 +- .../tsconfig.json | 0 .../tslint.json | 0 .../ng2-activiti-tasklist/typings.json | 7 + .../AlfrescoSettingsService.service.ts | 4 + 34 files changed, 427 insertions(+), 17 deletions(-) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/.editorconfig (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/.gitignore (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/.npmignore (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/LICENSE (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/README.md (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/assets/license_header.txt (100%) create mode 100644 ng2-components/ng2-activiti-tasklist/demo/.gitignore create mode 100644 ng2-components/ng2-activiti-tasklist/demo/.npmignore create mode 100644 ng2-components/ng2-activiti-tasklist/demo/README.md create mode 100644 ng2-components/ng2-activiti-tasklist/demo/index.html create mode 100644 ng2-components/ng2-activiti-tasklist/demo/package.json create mode 100644 ng2-components/ng2-activiti-tasklist/demo/src/main.ts create mode 100644 ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js create mode 100644 ng2-components/ng2-activiti-tasklist/demo/tsconfig.json create mode 100644 ng2-components/ng2-activiti-tasklist/demo/tslint.json rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist/demo}/typings.json (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/index.ts (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/karma-test-shim.js (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/karma.conf.js (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/package.json (98%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/assets/translation.service.mock.ts (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/components/activiti-tasklist.component.html (69%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/components/activiti-tasklist.component.spec.ts (95%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/components/activiti-tasklist.component.ts (93%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/models/filter.model.ts (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/services/activiti-tasklist.service.spec.ts (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/src/services/activiti-tasklist.service.ts (93%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/tsconfig.json (100%) rename ng2-components/{ng2-alfresco-activiti-tasklist => ng2-activiti-tasklist}/tslint.json (100%) create mode 100644 ng2-components/ng2-activiti-tasklist/typings.json diff --git a/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts b/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts index 2ff3f17503..2d608bc846 100644 --- a/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts +++ b/demo-shell-ng2/app/components/tasks/tasks-demo.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { ActivitiTaskList } from 'ng2-alfresco-activiti-tasklist'; +import { ActivitiTaskList } from 'ng2-activiti-tasklist'; import { ObjectDataTableAdapter, ObjectDataColumn } from 'ng2-alfresco-datatable'; @Component({ diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 59a55a0469..7cffed234d 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -83,7 +83,7 @@ "ng2-alfresco-upload": "0.2.0", "ng2-alfresco-viewer": "0.2.0", "ng2-activiti-form": "0.2.0", - "ng2-activiti-tasklist": "0.2.0" + "ng2-activiti-tasklist": "0.2.0", "ng2-alfresco-webscript": "file:../ng2-components/ng2-alfresco-webscript" }, "devDependencies": { diff --git a/demo-shell-ng2/systemjs.config.js b/demo-shell-ng2/systemjs.config.js index 90e52290fe..020ebdbd3e 100644 --- a/demo-shell-ng2/systemjs.config.js +++ b/demo-shell-ng2/systemjs.config.js @@ -20,7 +20,7 @@ 'ng2-activiti-form': 'node_modules/ng2-activiti-form/dist', 'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/dist', 'ng2-alfresco-webscript': 'node_modules/ng2-alfresco-webscript/dist', - 'ng2-alfresco-activiti-tasklist': 'node_modules/ng2-alfresco-activiti-tasklist/dist' + 'ng2-activiti-tasklist': 'node_modules/ng2-activiti-tasklist/dist' }; // packages tells the System loader how to load when no filename and/or no extension var packages = { @@ -38,7 +38,7 @@ 'ng2-alfresco-upload': { main: 'index.js', defaultExtension: 'js'}, 'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js'}, 'ng2-activiti-form': { main: 'index.js', defaultExtension: 'js'}, - 'ng2-alfresco-activiti-tasklist': { main: 'index.js', defaultExtension: 'js'} + 'ng2-activiti-tasklist': { main: 'index.js', defaultExtension: 'js'}, 'ng2-alfresco-webscript': { main: 'index.js', defaultExtension: 'js'} }; var ngPackageNames = [ diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/.editorconfig b/ng2-components/ng2-activiti-tasklist/.editorconfig similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/.editorconfig rename to ng2-components/ng2-activiti-tasklist/.editorconfig diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/.gitignore b/ng2-components/ng2-activiti-tasklist/.gitignore similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/.gitignore rename to ng2-components/ng2-activiti-tasklist/.gitignore diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/.npmignore b/ng2-components/ng2-activiti-tasklist/.npmignore similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/.npmignore rename to ng2-components/ng2-activiti-tasklist/.npmignore diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/LICENSE b/ng2-components/ng2-activiti-tasklist/LICENSE similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/LICENSE rename to ng2-components/ng2-activiti-tasklist/LICENSE diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/README.md rename to ng2-components/ng2-activiti-tasklist/README.md diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/assets/license_header.txt b/ng2-components/ng2-activiti-tasklist/assets/license_header.txt similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/assets/license_header.txt rename to ng2-components/ng2-activiti-tasklist/assets/license_header.txt diff --git a/ng2-components/ng2-activiti-tasklist/demo/.gitignore b/ng2-components/ng2-activiti-tasklist/demo/.gitignore new file mode 100644 index 0000000000..25beca4c27 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/.gitignore @@ -0,0 +1,6 @@ +node_modules +.idea +coverage +dist +typings +!systemjs.config.js diff --git a/ng2-components/ng2-activiti-tasklist/demo/.npmignore b/ng2-components/ng2-activiti-tasklist/demo/.npmignore new file mode 100644 index 0000000000..c51c008259 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/.npmignore @@ -0,0 +1,3 @@ +node_modules +dist +typings \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/demo/README.md b/ng2-components/ng2-activiti-tasklist/demo/README.md new file mode 100644 index 0000000000..28b3ffd976 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/README.md @@ -0,0 +1,13 @@ +# DataTable demo + +Install: + +``` +npm install +``` + +Run the project: + +``` +npm start +``` \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/demo/index.html b/ng2-components/ng2-activiti-tasklist/demo/index.html new file mode 100644 index 0000000000..5b926def7a --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/index.html @@ -0,0 +1,34 @@ + + + + + Angular 2 TaskList - Demo + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ng2-components/ng2-activiti-tasklist/demo/package.json b/ng2-components/ng2-activiti-tasklist/demo/package.json new file mode 100644 index 0000000000..ad89d4a646 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/package.json @@ -0,0 +1,78 @@ +{ + "name": "ng2-activiti-tasklist-demo", + "description": "Alfresco Angular2 DataTable Component - Demo", + "version": "0.1.0", + "author": "Alfresco Software, Ltd.", + "contributors": [ + { + "name": "Maurizio Vitale", + "email": "maurizio.vitale84@gmail.com" + } + ], + "main": "index.js", + "scripts": { + "clean": "rimraf dist node_modules typings", + "postinstall": "npm run typings && npm run build", + "typings": "typings install", + "start": "rimraf dist && npm install && npm run server", + "server": "wsrv -o", + "build": "npm run tslint && rimraf dist && tsc", + "tslint": "npm run tslint-src && npm run tslint-root", + "tslint-src": "tslint -c tslint.json src/{,**/}**.ts", + "tslint-root": "tslint -c tslint.json *.ts" + }, + "license": "Apache-2.0", + "dependencies": { + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", + "@angular/router-deprecated": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", + "systemjs": "0.19.27", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", + "rxjs": "5.0.0-beta.6", + "zone.js": "0.6.12", + "license-check": "1.1.5", + + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + "ng2-translate": "2.2.2", + + "ng2-alfresco-datatable": "^0.1.12", + "ng2-alfresco-core": "^0.1.36" + }, + "devDependencies": { + "browser-sync": "2.10.0", + "concurrently": "2.0.0", + "rimraf": "2.5.2", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4", + "wsrv": "0.1.3" + }, + "keywords": [ + "angular2", + "typescript" + ], + "license-check-config": { + "src": [ + "**/*.js", + "**/*.ts", + "!/**/coverage/**/*", + "!/**/demo/**/*", + "!/**/node_modules/**/*", + "!/**/typings/**/*", + "!*.js" + ], + "path": "assets/license_header.txt", + "blocking": true, + "logInfo": false, + "logError": true + } +} diff --git a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts new file mode 100644 index 0000000000..d1ff854273 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts @@ -0,0 +1,64 @@ +/*! + * @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, OnInit } from '@angular/core'; +import { HTTP_PROVIDERS } from '@angular/http'; +import { ALFRESCO_CORE_PROVIDERS, AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { bootstrap } from '@angular/platform-browser-dynamic'; +import { ActivitiTaskList } from 'ng2-activiti-tasklist'; +import { ObjectDataTableAdapter, ObjectDataColumn } from 'ng2-alfresco-datatable'; + +declare let AlfrescoApi: any; + +@Component({ + selector: 'activiti-tasklist-demo', + template: ` + + `, + styles: [ + ':host > .container {padding: 10px}', + '.p-10 { padding: 10px; }' + ], + directives: [ActivitiTaskList], + providers: [AlfrescoAuthenticationService] +}) +class ActivitiTaskListDemo implements OnInit { + data: ObjectDataTableAdapter; + + constructor(private setting: AlfrescoSettingsService) { + this.setting.setProviders(['BPM']); + this.data = new ObjectDataTableAdapter([], []); + } + + ngOnInit() { + let schema = [ + {type: 'text', key: 'id', title: 'Id'}, + {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}, + {type: 'text', key: 'formKey', title: 'Form Key', sortable: true}, + {type: 'text', key: 'created', title: 'Created', sortable: true} + ]; + + let columns = schema.map(col => new ObjectDataColumn(col)); + this.data.setColumns(columns); + } + +} + +bootstrap(ActivitiTaskListDemo, [ + HTTP_PROVIDERS, + ALFRESCO_CORE_PROVIDERS] +); diff --git a/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js b/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js new file mode 100644 index 0000000000..4a716d3e2a --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js @@ -0,0 +1,57 @@ +/** + * System configuration for Angular 2 samples + * Adjust as necessary for your application needs. + */ +(function(global) { + // map tells the System loader where to look for things + var map = { + 'app': 'dist', // 'dist', + '@angular': 'node_modules/@angular', + 'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api', + 'rxjs': 'node_modules/rxjs', + + 'ng2-translate': 'node_modules/ng2-translate', + 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist', + 'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/dist', + 'ng2-activiti-tasklist': 'node_modules/ng2-activiti-tasklist/dist' + }; + // packages tells the System loader how to load when no filename and/or no extension + var packages = { + 'app': { main: 'main.js', defaultExtension: 'js' }, + 'rxjs': { defaultExtension: 'js' }, + 'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' }, + + 'ng2-translate': { defaultExtension: 'js' }, + 'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' }, + 'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js' }, + 'ng2-activiti-tasklist': { main: 'index.js', defaultExtension: 'js' } + }; + var ngPackageNames = [ + 'common', + 'compiler', + 'core', + 'http', + 'platform-browser', + 'platform-browser-dynamic', + 'router', + 'router-deprecated', + 'upgrade' + ]; + // Individual files (~300 requests): + function packIndex(pkgName) { + packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' }; + } + // Bundled (~40 requests): + function packUmd(pkgName) { + packages['@angular/'+pkgName] = { main: '/bundles/' + pkgName + '.umd.js', defaultExtension: 'js' }; + } + // Most environments should use UMD; some (Karma) need the individual index files + var setPackageConfig = System.packageWithIndex ? packIndex : packUmd; + // Add package entries for angular packages + ngPackageNames.forEach(setPackageConfig); + var config = { + map: map, + packages: packages + }; + System.config(config); +})(this); diff --git a/ng2-components/ng2-activiti-tasklist/demo/tsconfig.json b/ng2-components/ng2-activiti-tasklist/demo/tsconfig.json new file mode 100644 index 0000000000..f6761b5218 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/tsconfig.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "target": "ES5", + "module": "system", + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "sourceMap": true, + "removeComments": true, + "declaration": true, + "outDir": "dist" + }, + "exclude": [ + "dist", + "node_modules", + "typings/main", + "typings/main.d.ts" + ] +} diff --git a/ng2-components/ng2-activiti-tasklist/demo/tslint.json b/ng2-components/ng2-activiti-tasklist/demo/tslint.json new file mode 100644 index 0000000000..8c48e76469 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/demo/tslint.json @@ -0,0 +1,124 @@ +{ + "rules": { + "align": [ + true, + "parameters", + "arguments", + "statements" + ], + "ban": false, + "class-name": true, + "comment-format": [ + true, + "check-space", + "check-lowercase" + ], + "curly": true, + "eofline": true, + "forin": true, + "indent": [ + true, + "spaces" + ], + "interface-name": false, + "jsdoc-format": true, + "label-position": true, + "label-undefined": true, + "max-line-length": [ + true, + 140 + ], + "member-ordering": [ + true, + "public-before-private", + "static-before-instance", + "variables-before-functions" + ], + "no-any": false, + "no-arg": true, + "no-bitwise": true, + "no-conditional-assignment": true, + "no-consecutive-blank-lines": false, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-constructor-vars": false, + "no-debugger": true, + "no-duplicate-key": true, + "no-duplicate-variable": true, + "no-empty": true, + "no-eval": true, + "no-inferrable-types": false, + "no-internal-module": true, + "no-require-imports": true, + "no-shadowed-variable": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unreachable": true, + "no-unused-expression": true, + "no-unused-variable": true, + "no-use-before-declare": true, + "no-var-keyword": true, + "no-var-requires": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "quotemark": [ + true, + "single", + "avoid-escape" + ], + "radix": true, + "semicolon": true, + "switch-default": true, + "trailing-comma": [ + true, + { + "multiline": "never", + "singleline": "never" + } + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef": false, + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "use-strict": false, + "variable-name": [ + true, + "check-format", + "allow-leading-underscore", + "ban-keywords" + ], + "whitespace": [ + true, + "check-branch", + "check-operator", + "check-separator", + "check-type", + "check-module", + "check-decl" + ] + } +} diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/typings.json b/ng2-components/ng2-activiti-tasklist/demo/typings.json similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/typings.json rename to ng2-components/ng2-activiti-tasklist/demo/typings.json diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/index.ts rename to ng2-components/ng2-activiti-tasklist/index.ts diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/karma-test-shim.js b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/karma-test-shim.js rename to ng2-components/ng2-activiti-tasklist/karma-test-shim.js diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/karma.conf.js b/ng2-components/ng2-activiti-tasklist/karma.conf.js similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/karma.conf.js rename to ng2-components/ng2-activiti-tasklist/karma.conf.js diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json similarity index 98% rename from ng2-components/ng2-alfresco-activiti-tasklist/package.json rename to ng2-components/ng2-activiti-tasklist/package.json index 6e122e61c5..dbc160e03f 100644 --- a/ng2-components/ng2-alfresco-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -1,5 +1,5 @@ { - "name": "ng2-alfresco-activiti-tasklist", + "name": "ng2-activiti-tasklist", "description": "Activiti Angular2 Task List Component", "version": "0.2.0", "author": "Alfresco Software, Ltd.", diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/assets/translation.service.mock.ts b/ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/assets/translation.service.mock.ts rename to ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html similarity index 69% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.html rename to ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html index 45d54a5c0c..71515f833f 100644 --- a/ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html @@ -1,6 +1,6 @@
diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts similarity index 95% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts rename to ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index a746afb4a1..fd32032863 100644 --- a/ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -91,11 +91,9 @@ describe('ActivitiTaskList', () => { taskList.filtersList.subscribe((res: any) => { expect(res).toBeDefined(); - expect(res.size).toEqual(2); - expect(res.total).toEqual(2); - expect(res.data.length).toEqual(2); - expect(res.data[0].name).toEqual('FakeInvolvedTasks'); - expect(res.data[1].name).toEqual('FakeMyTasks'); + expect(res.length).toEqual(2); + expect(res[0].name).toEqual('FakeInvolvedTasks'); + expect(res[1].name).toEqual('FakeMyTasks'); done(); }); }); diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts similarity index 93% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.ts rename to ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index 0a9ff59e55..239f568ec6 100644 --- a/ng2-components/ng2-alfresco-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -57,18 +57,17 @@ export class ActivitiTaskList implements OnInit { this.filter$ = new Observable(observer => this.filterObserver = observer).share(); if (translate) { - translate.addTranslationFolder('node_modules/ng2-alfresco-activiti-tasklist'); + translate.addTranslationFolder('node_modules/ng2-activiti-tasklist'); } } ngOnInit() { - this.filtersList = this.activiti.getTaskListFilters(); + this.filtersList = this.activiti.getTaskListFilters().map(res => (res.data)); this.filter$.subscribe((filter: FilterModel) => { this.activiti.getTasks(filter).subscribe( (res) => { - let tasks = res.data; - this.loadTasks(tasks); + this.loadTasks(res.data); }, (err) => { console.error(err); }); diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/models/filter.model.ts b/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/models/filter.model.ts rename to ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts rename to ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/src/services/activiti-tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts similarity index 93% rename from ng2-components/ng2-alfresco-activiti-tasklist/src/services/activiti-tasklist.service.ts rename to ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts index 9645ba72fc..c691404895 100644 --- a/ng2-components/ng2-alfresco-activiti-tasklist/src/services/activiti-tasklist.service.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts @@ -32,7 +32,9 @@ export class ActivitiTaskListService { */ getTaskListFilters(): Observable { return Observable.fromPromise(this.callApiTaskFilters()) - .map((res: Response) => res.json()) + .map((res: Response) => { + return res.json(); + }) .catch(this.handleError); } @@ -47,7 +49,9 @@ export class ActivitiTaskListService { data = JSON.stringify(data); return Observable.fromPromise(this.callApiTasksFiltered(data)) - .map((res: Response) => res.json()) + .map((res: Response) => { + return res.json(); + }) .catch(this.handleError); } diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/tsconfig.json b/ng2-components/ng2-activiti-tasklist/tsconfig.json similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/tsconfig.json rename to ng2-components/ng2-activiti-tasklist/tsconfig.json diff --git a/ng2-components/ng2-alfresco-activiti-tasklist/tslint.json b/ng2-components/ng2-activiti-tasklist/tslint.json similarity index 100% rename from ng2-components/ng2-alfresco-activiti-tasklist/tslint.json rename to ng2-components/ng2-activiti-tasklist/tslint.json diff --git a/ng2-components/ng2-activiti-tasklist/typings.json b/ng2-components/ng2-activiti-tasklist/typings.json new file mode 100644 index 0000000000..d8954c2485 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/typings.json @@ -0,0 +1,7 @@ +{ + "globalDependencies": { + "core-js": "registry:dt/core-js#0.0.0+20160317120654", + "jasmine": "registry:dt/jasmine#2.2.0+20160505161446", + "node": "registry:dt/node#4.0.0+20160509154515" + } +} diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts index c9c590c416..a970cb583b 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts @@ -45,4 +45,8 @@ export class AlfrescoSettingsService { getProviders(): string [] { return this.providers; } + + setProviders(providers: string []) { + this.providers = providers; + } }