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

Upgrade ng2-activiti-form

Browse Source
This commit is contained in:
Denys Vuika 2016-09-21 21:04:14 +01:00
parent de42bea0ba
commit f53bd264eb
30 changed files with 89 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
demo-shell-ng2/app/app.module.ts
View File

@ -30,13 +30,13 @@ import { UploadModule } from 'ng2-alfresco-upload';
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 { 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 { ActivitiForm, ATIVITI_FORM_PROVIDERS } from 'ng2-activiti-form';
import { AlfrescoTranslationLoader } from 'ng2-alfresco-core';
import { Http } from '@angular/http';
@ -55,46 +55,6 @@ import {
FormNodeViewer
} from './components/index';
import {
TabsWidget, ContainerWidget,
TextWidget,
NumberWidget,
CheckboxWidget,
MultilineTextWidget,
DropdownWidget,
HyperlinkWidget,
RadioButtonsWidget,
DisplayValueWidget,
DisplayTextWidget,
UploadWidget,
AttachWidget,
TypeaheadWidget,
FunctionalGroupWidget,
PeopleWidget
} from 'ng2-activiti-form';
// todo: temp
const ACTIVITI_FORM_DIRECTIVES: any[] = [
ActivitiForm,
TabsWidget,
ContainerWidget,
TextWidget,
NumberWidget,
CheckboxWidget,
MultilineTextWidget,
DropdownWidget,
HyperlinkWidget,
RadioButtonsWidget,
DisplayValueWidget,
DisplayTextWidget,
UploadWidget,
AttachWidget,
TypeaheadWidget,
FunctionalGroupWidget,
PeopleWidget
];
@NgModule({
imports: [
BrowserModule,
@ -115,14 +75,14 @@ const ACTIVITI_FORM_DIRECTIVES: any[] = [
UploadModule.forRoot(),
TagModule.forRoot(),
WebScriptModule,
ViewerModule.forRoot()
ViewerModule.forRoot(),
ActivitiFormModule.forRoot()
],
declarations: [
AppComponent,
SearchBarComponent,
...ALFRESCO_TASKLIST_DIRECTIVES,
...ACTIVITI_PROCESSLIST_DIRECTIVES,
...ACTIVITI_FORM_DIRECTIVES,
DataTableDemoComponent,
SearchComponent,
@ -136,9 +96,7 @@ const ACTIVITI_FORM_DIRECTIVES: any[] = [
FilesComponent,
FormNodeViewer
],
providers: [
...ATIVITI_FORM_PROVIDERS
],
providers: [],
bootstrap: [ AppComponent ]
})
export class AppModule { }

51
ng2-components/ng2-activiti-form/index.ts
View File

@ -15,9 +15,21 @@
* limitations under the License.
*/
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 { ActivitiForm } from './src/components/activiti-form.component';
import { FormService } from './src/services/form.service';
import { EcmModelService } from './src/services/ecm-model.service';
import { NodeService } from './src/services/node.service';
import { WidgetVisibilityService } from './src/services/widget-visibility.service';
import { ActivitiAlfrescoContentService } from './src/services/activiti-alfresco.service';
import { WIDGET_DIRECTIVES } from './src/components/widgets/index';
export * from './src/components/activiti-form.component';
export * from './src/services/form.service';
@ -25,9 +37,44 @@ export * from './src/components/widgets/index';
export * from './src/services/ecm-model.service';
export * from './src/services/node.service';
export const ACTIVITI_FORM_DIRECTIVES: any[] = [
ActivitiForm,
...WIDGET_DIRECTIVES
];
export const ATIVITI_FORM_PROVIDERS: [any] = [
export const ACTIVITI_FORM_PROVIDERS: any[] = [
FormService,
EcmModelService,
NodeService
NodeService,
WidgetVisibilityService,
ActivitiAlfrescoContentService
];
@NgModule({
imports: [
CommonModule,
FormsModule,
HttpModule,
TranslateModule,
CoreModule
],
declarations: [
...ACTIVITI_FORM_DIRECTIVES
],
providers: [
...ACTIVITI_FORM_PROVIDERS
],
exports: [
...ACTIVITI_FORM_DIRECTIVES
]
})
export class ActivitiFormModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: ActivitiFormModule,
providers: [
...ACTIVITI_FORM_PROVIDERS
]
};
}
}

32
ng2-components/ng2-activiti-form/package.json
View File

@ -45,23 +45,23 @@
"activiti"
],
"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",
"alfresco-js-api": "^0.3.0",
"@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",
"alfresco-js-api": "^0.3.0",
"ng2-translate": "2.5.0",
"ng2-alfresco-core": "0.3.2"
},
"devDependencies": {

2
ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
View File

@ -15,14 +15,12 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { SimpleChange } from '@angular/core';
import { ActivitiForm } from './activiti-form.component';
import { FormModel, FormOutcomeModel, FormFieldModel, FormOutcomeEvent } from './widgets/index';
import { FormService } from './../services/form.service';
import { WidgetVisibilityService } from './../services/widget-visibility.service';
// import { ContainerWidget } from './widgets/container/container.widget';
describe('ActivitiForm', () => {

9
ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
View File

@ -23,16 +23,11 @@ import {
Output,
EventEmitter
} from '@angular/core';
import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
import { EcmModelService } from './../services/ecm-model.service';
import { FormService } from './../services/form.service';
import { ActivitiAlfrescoContentService } from './../services/activiti-alfresco.service';
import { NodeService } from './../services/node.service';
import { FormModel, FormOutcomeModel, FormValues, FormFieldModel, FormOutcomeEvent } from './widgets/core/index';
import { TabsWidget } from './widgets/tabs/tabs.widget';
import { ContainerWidget } from './widgets/container/container.widget';
declare let __moduleName: string;
declare var componentHandler;
@ -84,9 +79,7 @@ import { WidgetVisibilityService } from './../services/widget-visibility.servic
moduleId: __moduleName,
selector: 'activiti-form',
templateUrl: './activiti-form.component.html',
styleUrls: ['./activiti-form.component.css'],
directives: [MATERIAL_DESIGN_DIRECTIVES, ContainerWidget, TabsWidget],
providers: [EcmModelService, FormService, ActivitiAlfrescoContentService, WidgetVisibilityService, NodeService]
styleUrls: ['./activiti-form.component.css']
})
export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {

1
ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { ContainerWidget } from './container.widget';
import { FormModel } from './../core/form.model';
import { ContainerModel } from './../core/container.model';

12
ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
View File

@ -16,11 +16,7 @@
*/
import { Component, Input, AfterViewInit, Output, EventEmitter } from '@angular/core';
import { ContainerModel } from './../core/index';
import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
import { PRIMITIVE_WIDGET_DIRECTIVES } from './../index';
import { FormFieldModel } from '../core/index';
import { ContainerModel, FormFieldModel } from './../core/index';
declare let __moduleName: string;
declare var componentHandler;
@ -29,11 +25,7 @@ declare var componentHandler;
moduleId: __moduleName,
selector: 'container-widget',
templateUrl: './container.widget.html',
styleUrls: ['./container.widget.css'],
directives: [
MATERIAL_DESIGN_DIRECTIVES,
PRIMITIVE_WIDGET_DIRECTIVES
]
styleUrls: ['./container.widget.css']
})
export class ContainerWidget implements AfterViewInit {

1
ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { ContainerColumnModel } from './container-column.model';
import { FormModel } from './form.model';
import { FormFieldModel } from './form-field.model';

1
ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { ContainerModel } from './container.model';
import { FormModel } from './form.model';
import { FormFieldTypes } from './form-field-types';

1
ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { FormModel } from './form.model';
import { FormFieldModel } from './form-field.model';
import { FormFieldOption } from './form-field-option';

2
ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts
View File

@ -15,12 +15,10 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { FormFieldModel } from './form-field.model';
import { FormFieldTypes } from './form-field-types';
import { FormModel } from './form.model';
describe('FormFieldModel', () => {
it('should store the form reference', () => {

1
ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { FormModel } from './form.model';
import { FormOutcomeModel } from './form-outcome.model';

1
ng2-components/ng2-activiti-form/src/components/widgets/core/form-widget.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { FormModel } from './form.model';
import { FormWidgetModel } from './form-widget.model';

1
ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { FormModel } from './form.model';
import { TabModel } from './tab.model';
import { ContainerModel } from './container.model';

1
ng2-components/ng2-activiti-form/src/components/widgets/core/group-user.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { GroupUserModel } from './group-user.model';
describe('GroupUserModel', () => {

1
ng2-components/ng2-activiti-form/src/components/widgets/core/tab.model.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect } from '@angular/core/testing';
import { FormModel } from './form.model';
import { TabModel } from './tab.model';
import { ContainerModel } from './container.model';

1
ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { FormService } from '../../../services/form.service';
import { DropdownWidget } from './dropdown.widget';

1
ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { FunctionalGroupWidget } from './functional-group.widget';
import { FormService } from '../../../services/form.service';

1
ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { HyperlinkWidget } from './hyperlink.widget';
import { FormModel } from './../core/form.model';
import { FormFieldModel } from './../core/form-field.model';

9
ng2-components/ng2-activiti-form/src/components/widgets/index.ts
View File

@ -57,12 +57,9 @@ export * from './typeahead/typeahead.widget';
export * from './functional-group/functional-group.widget';
export * from './people/people.widget';
export const CONTAINER_WIDGET_DIRECTIVES: [any] = [
export const WIDGET_DIRECTIVES: any[] = [
TabsWidget,
ContainerWidget
];
export const PRIMITIVE_WIDGET_DIRECTIVES: [any] = [
ContainerWidget,
TextWidget,
NumberWidget,
CheckboxWidget,
@ -78,5 +75,3 @@ export const PRIMITIVE_WIDGET_DIRECTIVES: [any] = [
FunctionalGroupWidget,
PeopleWidget
];

2
ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts
View File

@ -15,13 +15,11 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { PeopleWidget } from './people.widget';
import { FormService } from '../../../services/form.service';
import { FormModel } from '../core/form.model';
import { FormFieldModel } from '../core/form-field.model';
// import { GroupModel } from '../core/group.model';
import { GroupUserModel } from '../core/group-user.model';
describe('PeopleWidget', () => {

1
ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { FormService } from '../../../services/form.service';
import { RadioButtonsWidget } from './radio-buttons.widget';

1
ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { TabsWidget } from './tabs.widget';
import { TabModel } from './../core/tab.model';

5
ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.ts
View File

@ -16,9 +16,7 @@
*/
import { Component, Input, AfterViewInit } from '@angular/core';
import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
import { TabModel } from './../core/index';
import { ContainerWidget } from './../container/container.widget';
declare let __moduleName: string;
declare var componentHandler;
@ -26,8 +24,7 @@ declare var componentHandler;
@Component({
moduleId: __moduleName,
selector: 'tabs-widget',
templateUrl: './tabs.widget.html',
directives: [MATERIAL_DESIGN_DIRECTIVES, ContainerWidget]
templateUrl: './tabs.widget.html'
})
export class TabsWidget implements AfterViewInit {

1
ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { TypeaheadWidget } from './typeahead.widget';
import { FormService } from '../../../services/form.service';

1
ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts
View File

@ -15,7 +15,6 @@
* limitations under the License.
*/
import { it, describe, expect, beforeEach } from '@angular/core/testing';
import { WidgetComponent } from './widget.component';
import { FormFieldModel } from './core/form-field.model';
import { FormModel } from './core/form.model';

2
ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
/*
import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
import { NodeService } from './node.service';
@ -339,3 +340,4 @@ describe('EcmModelService', () => {
});
});
});
*/

2
ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
/*
import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
import { HTTP_PROVIDERS, Response, ResponseOptions } from '@angular/http';
@ -416,3 +417,4 @@ describe('FormService', () => {
}
});
});
*/

2
ng2-components/ng2-activiti-form/src/services/node.service.spec.ts
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
/*
import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
import { NodeService } from './node.service';
@ -169,3 +170,4 @@ describe('NodeService', () => {
});
});
*/

26
ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
/*
import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
import { WidgetVisibilityService } from './widget-visibility.service';
import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
@ -205,8 +206,7 @@ describe('WidgetVisibilityService', () => {
expect(res).toBeFalsy();
});
/*
it('should be able to retrieve the value of a process variable', (done) => {
xit('should be able to retrieve the value of a process variable', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
done();
@ -224,7 +224,6 @@ describe('WidgetVisibilityService', () => {
expect(varValue).not.toBe(null);
expect(varValue).toBe('test_value_1');
});
*/
it('should be able to retrieve the value of a form variable', () => {
let fakeForm = new FormModel({variables: [
@ -238,8 +237,7 @@ describe('WidgetVisibilityService', () => {
expect(varValue).toBe('form_value_test');
});
/*
it('should return null if the variable does not exist', (done) => {
xit('should return null if the variable does not exist', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
done();
@ -255,7 +253,6 @@ describe('WidgetVisibilityService', () => {
expect(varValue).toBe(null);
});
*/
it('should be able to retrieve a field value searching in the form', () => {
let stubFormWithFields = new FormModel(fakeFormJson);
@ -310,8 +307,7 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).toBe('100');
});
/*
it('should retrieve the value for the right field when it is a process variable', (done) => {
xit('should retrieve the value for the right field when it is a process variable', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
done();
@ -330,7 +326,6 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).not.toBe(null);
expect(rightValue).toBe('test_value_2');
});
*/
it('should retrieve the value for the right field when it is a form variable', () => {
let fakeFormWithField = new FormModel(fakeFormJson);
@ -366,8 +361,7 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).toBe(null);
});
/*
it('should retrieve the value for the left field when it is a process variable', (variableUpdated) => {
xit('should retrieve the value for the left field when it is a process variable', (variableUpdated) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
variableUpdated();
@ -386,7 +380,6 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).not.toBe(null);
expect(rightValue).toBe('test_value_2');
});
*/
it('should retrieve the value for the left field when it is a form variable', () => {
let fakeForm = new FormModel({variables: [
@ -470,8 +463,7 @@ describe('WidgetVisibilityService', () => {
expect(isVisible).toBeTruthy();
});
/*
it('should evaluate the visibility for the field between form value and process var', (varReady) => {
xit('should evaluate the visibility for the field between form value and process var', (varReady) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
varReady();
@ -492,10 +484,8 @@ describe('WidgetVisibilityService', () => {
expect(isVisible).toBeTruthy();
});
*/
/*
it('should evaluate visibility with multiple conditions', (ready) => {
xit('should evaluate visibility with multiple conditions', (ready) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
ready();
@ -521,7 +511,6 @@ describe('WidgetVisibilityService', () => {
expect(isVisible).toBeTruthy();
});
*/
it('should return true when the visibility condition is not valid', () => {
let visibilityObjTest = new WidgetVisibilityModel();
@ -561,3 +550,4 @@ describe('WidgetVisibilityService', () => {
expect(fakeFormField.isVisible).toBeFalsy();
});
});
*/