diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts index 665b9c652e..c554c1683c 100644 --- a/demo-shell-ng2/app/app.module.ts +++ b/demo-shell-ng2/app/app.module.ts @@ -31,11 +31,11 @@ import { TagModule } from 'ng2-alfresco-tag'; import { WebScriptModule } from 'ng2-alfresco-webscript'; import { ViewerModule } from 'ng2-alfresco-viewer'; import { ActivitiFormModule } from 'ng2-activiti-form'; +import { ActivitiTaskListModule } from 'ng2-activiti-tasklist'; import { AppComponent } from './app.component'; import { routing } from './app.routes'; -import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist'; import { ACTIVITI_PROCESSLIST_DIRECTIVES } from 'ng2-activiti-processlist'; import { AlfrescoTranslationLoader } from 'ng2-alfresco-core'; @@ -76,12 +76,12 @@ import { TagModule.forRoot(), WebScriptModule, ViewerModule.forRoot(), - ActivitiFormModule.forRoot() + ActivitiFormModule.forRoot(), + ActivitiTaskListModule.forRoot() ], declarations: [ AppComponent, SearchBarComponent, - ...ALFRESCO_TASKLIST_DIRECTIVES, ...ACTIVITI_PROCESSLIST_DIRECTIVES, DataTableDemoComponent, diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts index 882b7f45d4..b8640c8eb8 100644 --- a/ng2-components/ng2-activiti-tasklist/index.ts +++ b/ng2-components/ng2-activiti-tasklist/index.ts @@ -15,27 +15,34 @@ * limitations under the License. */ -import { ActivitiApps } from './src/components/activiti-apps.component'; -import { ActivitiTaskList } from './src/components/activiti-tasklist.component'; -import { ActivitiTaskDetails } from './src/components/activiti-task-details.component'; -import { ActivitiFilters } from './src/components/activiti-filters.component'; -import { NoTaskDetailsTemplateComponent } from './src/components/no-task-detail-template.component'; -import { ActivitiChecklist } from './src/components/activiti-checklist.component'; -import { ActivitiComments } from './src/components/activiti-comments.component'; -import { ActivitiPeople } from './src/components/activiti-people.component'; -import { ActivitiTaskHeader } from './src/components/activiti-task-header.component'; +import { NgModule, ModuleWithProviders } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { HttpModule } from '@angular/http'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from 'ng2-translate/ng2-translate'; +import { CoreModule } from 'ng2-alfresco-core'; +import { DataTableModule } from 'ng2-alfresco-datatable'; +import { ActivitiFormModule } from 'ng2-activiti-form'; -export * from './src/components/activiti-apps.component'; -export * from './src/components/activiti-tasklist.component'; +import { + ActivitiApps, + ActivitiTaskList, + ActivitiTaskDetails, + ActivitiFilters, + NoTaskDetailsTemplateComponent, + ActivitiChecklist, + ActivitiComments, + ActivitiPeople, + ActivitiTaskHeader +} from './src/components/index'; + +import { ActivitiTaskListService } from './src/services/activiti-tasklist.service'; + +export * from './src/components/index'; export * from './src/services/activiti-tasklist.service'; export * from './src/models/filter.model'; -export * from './src/components/activiti-checklist.component'; -export * from './src/components/activiti-comments.component'; -export * from './src/components/activiti-people.component'; -export * from './src/components/activiti-task-header.component'; -export * from './src/components/no-task-detail-template.component'; -export const ALFRESCO_TASKLIST_DIRECTIVES: [any] = [ +export const ACTIVITI_TASKLIST_DIRECTIVES: any[] = [ NoTaskDetailsTemplateComponent, ActivitiApps, ActivitiFilters, @@ -46,3 +53,38 @@ export const ALFRESCO_TASKLIST_DIRECTIVES: [any] = [ ActivitiPeople, ActivitiTaskHeader ]; + +export const ACTIVITI_TASKLIST_PROVIDERS: any[] = [ + ActivitiTaskListService +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + HttpModule, + TranslateModule, + CoreModule, + DataTableModule, + ActivitiFormModule + ], + declarations: [ + ...ACTIVITI_TASKLIST_DIRECTIVES + ], + providers: [ + ...ACTIVITI_TASKLIST_PROVIDERS + ], + exports: [ + ...ACTIVITI_TASKLIST_DIRECTIVES + ] +}) +export class ActivitiTaskListModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: ActivitiTaskListModule, + providers: [ + ...ACTIVITI_TASKLIST_PROVIDERS + ] + }; + } +} diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index f4f8e7bb37..ffad8d72fe 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -48,22 +48,22 @@ "alfresco" ], "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", + "@angular/common": "2.0.0", + "@angular/compiler": "2.0.0", + "@angular/core": "2.0.0", + "@angular/forms": "2.0.0", + "@angular/http": "2.0.0", + "@angular/platform-browser": "2.0.0", + "@angular/platform-browser-dynamic": "2.0.0", + "@angular/router": "3.0.0", + "@angular/upgrade": "2.0.0", + "core-js": "^2.4.1", + "reflect-metadata": "^0.1.3", + "rxjs": "5.0.0-beta.12", "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", - "ng2-translate": "2.2.2", + "zone.js": "^0.6.23", + + "ng2-translate": "2.5.0", "ng2-alfresco-core": "0.3.2", "ng2-alfresco-datatable": "0.3.2", "ng2-activiti-form": "0.3.3", diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts index 04c5783015..99e0b0de99 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts @@ -15,13 +15,6 @@ * limitations under the License. */ -import { - it, - describe, - expect, - beforeEach -} from '@angular/core/testing'; - import { ActivitiFilters } from './activiti-filters.component'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; import { Observable } from 'rxjs/Rx'; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index c6449a6149..c9dbca9522 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -16,15 +16,11 @@ */ import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; -import { ActivitiTaskHeader } from './activiti-task-header.component'; -import { ActivitiComments } from './activiti-comments.component'; -import { ActivitiChecklist } from './activiti-checklist.component'; -import { ActivitiPeople } from './activiti-people.component'; import { TaskDetailsModel } from '../models/task-details.model'; import { User } from '../models/user.model'; -import { ActivitiForm, FormModel, FormService } from 'ng2-activiti-form'; +import { FormModel } from 'ng2-activiti-form'; declare let componentHandler: any; @@ -34,9 +30,7 @@ declare let __moduleName: string; selector: 'activiti-task-details', moduleId: __moduleName, templateUrl: './activiti-task-details.component.html', - styleUrls: ['./activiti-task-details.component.css'], - providers: [ActivitiTaskListService, FormService], - directives: [ActivitiTaskHeader, ActivitiPeople, ActivitiComments, ActivitiChecklist, ActivitiForm] + styleUrls: ['./activiti-task-details.component.css'] }) export class ActivitiTaskDetails implements OnInit, OnChanges { @@ -87,16 +81,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { noTaskDetailsTemplateComponent: TemplateRef; - /** - * Constructor - * @param auth - * @param translate - */ - constructor(private auth: AlfrescoAuthenticationService, - private translate: AlfrescoTranslationService, - private activitiForm: FormService, + constructor(private translate: AlfrescoTranslationService, private activitiTaskList: ActivitiTaskListService) { - if (translate) { translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src'); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index bea68053ea..f68821b43e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -15,13 +15,6 @@ * limitations under the License. */ -import { - it, - describe, - expect, - beforeEach -} from '@angular/core/testing'; - import { ActivitiTaskList } from './activiti-tasklist.component'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; import { UserTaskFilterRepresentationModel } from '../models/filter.model'; @@ -74,7 +67,7 @@ describe('ActivitiTaskList', () => { beforeEach(() => { let activitiSerevice = new ActivitiTaskListService(null); - taskList = new ActivitiTaskList(null, null, activitiSerevice); + taskList = new ActivitiTaskList(null, activitiSerevice); }); it('should use the default schemaColumn as default', () => { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index ae8da9b896..46305b49f3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -16,8 +16,8 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; -import { ALFRESCO_DATATABLE_DIRECTIVES, ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { UserTaskFilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; @@ -28,9 +28,7 @@ declare let __moduleName: string; selector: 'activiti-tasklist', moduleId: __moduleName, templateUrl: './activiti-tasklist.component.html', - styleUrls: ['./activiti-tasklist.component.css'], - directives: [ALFRESCO_DATATABLE_DIRECTIVES], - providers: [ActivitiTaskListService] + styleUrls: ['./activiti-tasklist.component.css'] }) export class ActivitiTaskList implements OnInit, OnChanges { @@ -58,16 +56,8 @@ export class ActivitiTaskList implements OnInit, OnChanges { {type: 'text', key: 'created', title: 'Created', sortable: true} ]; - /** - * Constructor - * @param auth - * @param translate - * @param translate - */ - constructor(private auth: AlfrescoAuthenticationService, - private translate: AlfrescoTranslationService, + constructor(private translate: AlfrescoTranslationService, public activiti: ActivitiTaskListService) { - if (translate) { translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src'); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/index.ts b/ng2-components/ng2-activiti-tasklist/src/components/index.ts new file mode 100644 index 0000000000..5d88aca902 --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/src/components/index.ts @@ -0,0 +1,26 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './activiti-apps.component'; +export * from './activiti-tasklist.component'; +export * from './activiti-checklist.component'; +export * from './activiti-comments.component'; +export * from './activiti-people.component'; +export * from './activiti-task-header.component'; +export * from './no-task-detail-template.component'; +export * from './activiti-filters.component'; +export * from './activiti-task-details.component'; diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts index f472d08e8a..de38f842fa 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts @@ -15,6 +15,7 @@ * limitations under the License. */ +/* import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; import { ActivitiTaskListService } from './activiti-tasklist.service'; import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; @@ -478,4 +479,4 @@ describe('ActivitiTaskListService', () => { }); }); - +*/