diff --git a/demo-shell-ng2/app/components/activiti/form-viewer.component.html b/demo-shell-ng2/app/components/activiti/form-viewer.component.html index e26465dae5..0d499088c8 100644 --- a/demo-shell-ng2/app/components/activiti/form-viewer.component.html +++ b/demo-shell-ng2/app/components/activiti/form-viewer.component.html @@ -1,4 +1,11 @@
- - + + + >
diff --git a/demo-shell-ng2/app/components/activiti/form-viewer.component.ts b/demo-shell-ng2/app/components/activiti/form-viewer.component.ts index fd06f7254e..2acfc75777 100644 --- a/demo-shell-ng2/app/components/activiti/form-viewer.component.ts +++ b/demo-shell-ng2/app/components/activiti/form-viewer.component.ts @@ -17,7 +17,7 @@ import { Component, OnInit, OnDestroy, AfterViewChecked } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { ActivitiForm, FormService } from 'ng2-activiti-form'; +import { ActivitiForm, FormService, EcmModelService, NodeService } from 'ng2-activiti-form'; import { Subscription } from 'rxjs/Rx'; declare let __moduleName: string; @@ -29,7 +29,7 @@ declare var componentHandler; templateUrl: './form-viewer.component.html', styleUrls: ['./form-viewer.component.css'], directives: [ActivitiForm], - providers: [FormService] + providers: [FormService, EcmModelService, NodeService] }) export class FormViewer implements OnInit, OnDestroy, AfterViewChecked { diff --git a/ng2-components/ng2-activiti-form/index.ts b/ng2-components/ng2-activiti-form/index.ts index f57a867f26..e068b05e66 100644 --- a/ng2-components/ng2-activiti-form/index.ts +++ b/ng2-components/ng2-activiti-form/index.ts @@ -18,3 +18,5 @@ export * from './src/components/activiti-form.component'; export * from './src/services/form.service'; export * from './src/components/widgets/index'; +export * from './src/services/ecm-model.service'; +export * from './src/services/node.service'; diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts index 0c52be73cf..133206d5b6 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts @@ -40,7 +40,7 @@ describe('ActivitiForm', () => { ]); window['componentHandler'] = componentHandler; - formService = new FormService(null); + formService = new FormService(null, null); formComponent = new ActivitiForm(formService, visibilityService, null, null, null); }); diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts index 6d043e8b1b..d68d7e0741 100644 --- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts +++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts @@ -73,7 +73,7 @@ import { WidgetVisibilityService } from './../services/widget-visibility.servic templateUrl: './activiti-form.component.html', styleUrls: ['./activiti-form.component.css'], directives: [MATERIAL_DESIGN_DIRECTIVES, ContainerWidget, TabsWidget], - providers: [FormService, WidgetVisibilityService, EcmModelService, NodeService] + providers: [EcmModelService, FormService, WidgetVisibilityService, NodeService] }) export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { @@ -99,6 +99,12 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { @Input() data: FormValues; + @Input() + path: string; + + @Input() + nameNode: string; + @Input() showTitle: boolean = true; @@ -165,7 +171,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { ngOnInit() { if (this.nodeId) { - this.loadFormForEcmMetadata(); + this.loadActivitiFormForEcmNode(); } else { this.loadForm(); } @@ -290,7 +296,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { .getFormDefinitionById(formId) .subscribe( form => { - // console.log('Get Form By definition Id', form); + this.formName = form.name; this.form = this.parseForm(form); this.formLoaded.emit(this.form); }, @@ -376,18 +382,19 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { } } - private loadFormForEcmMetadata(): void { + private loadActivitiFormForEcmNode(): void { this.nodeService.getNodeMetadata(this.nodeId).subscribe(data => { - this.loadFormFromActiviti(data.nodeType, data.metadata); + this.data = data.metadata; + this.loadFormFromActiviti(data.nodeType); }, this.handleError); } - public loadFormFromActiviti(nodeType: string, metadata: any): any { + public loadFormFromActiviti(nodeType: string): any { this.formService.searchFrom(nodeType).subscribe( form => { if (!form) { - this.formService.createFormFromMetadaProperties(nodeType, metadata).subscribe(formMetadata => { + this.formService.createFormFromNodeType(nodeType).subscribe(formMetadata => { this.loadFormFromFormId(formMetadata.id); }); } else { @@ -404,64 +411,11 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges { } private storeFormAsMetadata() { - if (this.saveMetadata) { - let modelName = 'activitiForms'; - - - this.ecmModelService.getEcmModels().subscribe( - models => { - if (!this.ecmModelService.isAnEcmModelExistingForThisForm(models, modelName)) { - let modelNamespace = 'activitiFormsModel'; - this.createAndActiveEcmModel(modelName, modelNamespace); - } else { - this.createModelType(modelName); - } - }, - this.handleError - ); - } - } - - - private createAndActiveEcmModel(modelName: string, modelNamespace: string) { - this.ecmModelService.createEcmModel(modelName, modelNamespace).subscribe( - model => { - console.log('model created', model); - - this.ecmModelService.activeEcmModel(modelName).subscribe( - modelActive => { - console.log('model active', modelActive); - this.createModelType(modelName); - }, - this.handleError - ); - }, - this.handleError - ); - } - - private createModelType(modelName: string) { - this.ecmModelService.getEcmTypes(modelName).subscribe( - customTypes => { - console.log('custom types', customTypes); - - let customType = customTypes.list.entries.find(type => type.entry.name === this.formName); - if (!customType) { - let typeName = this.formName; - this.ecmModelService.createEcmType(this.formName, modelName, 'cm:folder').subscribe( - typeCreated => { - console.log('type Created', typeCreated); - - this.ecmModelService.addPropertyToAType(modelName, typeName, this.form).subscribe( - properyAdded => { - console.log('property Added', properyAdded); - }, - this.handleError); - }, - this.handleError); + this.ecmModelService.createEcmTypeForActivitiForm(this.formName, this.form).subscribe(type => { + if (this.saveMetadata) { + this.nodeService.createNodeMetadata(type.nodeType || type.entry.prefixedName, EcmModelService.MODEL_NAMESPACE, this.form.values, this.path, this.nameNode); } - }, - this.handleError + }, this.handleError ); } } diff --git a/ng2-components/ng2-activiti-form/src/models/form-definition.model.ts b/ng2-components/ng2-activiti-form/src/models/form-definition.model.ts index 88d20c4517..fd7fd95b8e 100644 --- a/ng2-components/ng2-activiti-form/src/models/form-definition.model.ts +++ b/ng2-components/ng2-activiti-form/src/models/form-definition.model.ts @@ -62,12 +62,12 @@ export class FormDefinitionModel { private metadataToFields(metadata: any): any[] { let fields = []; if (metadata) { - for (let key in metadata) { - if (key) { + metadata.forEach(function(property) { + if (property) { let field = { type: 'text', - id: key, - name: key, + id: property.name, + name: property.name, required: false, readOnly: false, sizeX: 1, @@ -87,7 +87,7 @@ export class FormDefinitionModel { }; fields.push(field); } - } + }); } return fields; diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts index 5dad4a9829..99eaeb5485 100644 --- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts @@ -19,22 +19,112 @@ import { Injectable } from '@angular/core'; import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { Response, Http, Headers, RequestOptions } from '@angular/http'; +import { FormModel } from '../components/widgets/core/form.model'; +import { NodeService } from './node.service'; @Injectable() export class EcmModelService { + public static MODEL_NAMESPACE: string = 'activitiForms'; + public static MODEL_NAME: string = 'activitiFormsModel'; + public static TYPE_MODEL: string = 'cm:folder'; + constructor(private authService: AlfrescoAuthenticationService, private http: Http, - public alfrescoSettingsService: AlfrescoSettingsService) { + public alfrescoSettingsService: AlfrescoSettingsService, + private nodeService: NodeService) { } - public isAnEcmModelExistingForThisForm(ecmModels: any, modelName: string) { - let formEcmModel = ecmModels.list.entries.find(model => model.entry.name === modelName); - if (!formEcmModel) { - return false; - } else { - return true; - } + public createEcmTypeForActivitiForm(formName: string, form: FormModel): Observable { + return Observable.create(observer => { + this.seachActivitiEcmModel().subscribe( + model => { + if (!model) { + this.createActivitiEcmModel(formName, form).subscribe(typeForm => { + observer.next(typeForm); + observer.complete(); + }); + } else { + this.createFomType(formName, form).subscribe(typeForm => { + observer.next(typeForm); + observer.complete(); + }); + } + }, + this.handleError + ); + }); + + } + + private seachActivitiEcmModel() { + return this.getEcmModels().map(function (ecmModels: any) { + return ecmModels.list.entries.find(model => model.entry.name === EcmModelService.MODEL_NAME); + }); + } + + private createActivitiEcmModel(formName: string, form: FormModel): Observable { + return Observable.create(observer => { + this.createEcmModel(EcmModelService.MODEL_NAME, EcmModelService.MODEL_NAMESPACE).subscribe( + model => { + console.log('model created', model); + this.activeEcmModel(EcmModelService.MODEL_NAME).subscribe( + modelActive => { + console.log('model active', modelActive); + this.createEcmTypeWithProperties(formName, form).subscribe(typeCreated => { + observer.next(typeCreated); + observer.complete(); + }); + }, + this.handleError + ); + }, + this.handleError + ); + }); + } + + private createFomType(formName: string, form: FormModel): Observable { + return Observable.create(observer => { + this.searchFormType(formName).subscribe( + ecmType => { + console.log('custom types', ecmType); + if (!ecmType) { + this.createEcmTypeWithProperties(formName, form).subscribe(typeCreated => { + observer.next(typeCreated); + observer.complete(); + }); + } else { + observer.next(ecmType); + observer.complete(); + } + }, + this.handleError + ); + }); + } + + public createEcmTypeWithProperties(formName: string, form: FormModel): Observable { + return Observable.create(observer => { + this.createEcmType(formName, EcmModelService.MODEL_NAME, EcmModelService.TYPE_MODEL).subscribe( + typeCreated => { + console.log('type Created', typeCreated); + this.addPropertyToAType(EcmModelService.MODEL_NAME, formName, form).subscribe( + properyAdded => { + console.log('property Added', properyAdded); + observer.next(typeCreated); + observer.complete(); + }, + this.handleError); + }, + this.handleError); + }); + } + + public searchFormType(formName: string): Observable { + return this.getEcmType(EcmModelService.MODEL_NAME).map(function (customTypes: any) { + return customTypes.list.entries.find(type => type.entry.prefixedName === formName); + }); } public activeEcmModel(modelName: string): Observable { @@ -76,7 +166,7 @@ export class EcmModelService { } - public getEcmTypes(modelName: string): Observable { + public getEcmType(modelName: string): Observable { let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm/${modelName}/types`; let options = this.getRequestOptions(); diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts index 7b5507fad1..efef9b683c 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts @@ -20,6 +20,7 @@ import { Observable } from 'rxjs/Rx'; import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { FormValues } from './../components/widgets/core/index'; import { FormDefinitionModel } from '../models/form-definition.model'; +import { EcmModelService } from './ecm-model.service'; @Injectable() export class FormService { @@ -27,23 +28,27 @@ export class FormService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; - constructor(private authService: AlfrescoAuthenticationService) { + constructor(private authService: AlfrescoAuthenticationService, + private ecmModelService: EcmModelService) { } /** * Create a Form with a fields for each metadata properties * @returns {Observable} */ - public createFormFromMetadaProperties(formName: string, metadata: any): Observable { + public createFormFromNodeType(formName: string): Observable { return Observable.create(observer => { - this.createFormModel(formName).subscribe( + this.createForm(formName).subscribe( form => { - let formDefinitionModel = new FormDefinitionModel(form.id, form.name, form.lastUpdatedByFullName, form.lastUpdated, metadata); - - this.addFieldsToAFormFromMetadata(form.id, formDefinitionModel).subscribe(formData => { - observer.next(formData); - observer.complete(); - }, this.handleError); + this.ecmModelService.searchFormType(formName).subscribe( + customType => { + let formDefinitionModel = new FormDefinitionModel(form.id, form.name, form.lastUpdatedByFullName, form.lastUpdated, customType.entry.properties); + this.addFieldsNodeTypePropertiesToTheForm(form.id, formDefinitionModel).subscribe(formData => { + observer.next(formData); + observer.complete(); + }, this.handleError); + }, + this.handleError); }, this.handleError); }); } @@ -52,8 +57,7 @@ export class FormService { * Create a Form * @returns {Observable} */ - public createFormModel(formName: string): Observable { - + public createForm(formName: string): Observable { let dataModel = { name: formName, description: '', @@ -68,7 +72,7 @@ export class FormService { * Add Fields to A form from a metadata properties * @returns {Observable} */ - public addFieldsToAFormFromMetadata(formId: string, formDefinitionModel: FormDefinitionModel): Observable { + public addFieldsNodeTypePropertiesToTheForm(formId: string, formDefinitionModel: FormDefinitionModel): Observable { return this.addFieldsToAForm(formId, formDefinitionModel); } diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.ts b/ng2-components/ng2-activiti-form/src/services/node.service.ts index f71469c5f6..10a9c39815 100644 --- a/ng2-components/ng2-activiti-form/src/services/node.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/node.service.ts @@ -35,6 +35,51 @@ export class NodeService { return Observable.fromPromise(this.authService.getAlfrescoApi().nodes.getNodeInfo(nodeId)).map(this.cleanMetadataFromSemicolon); } + /** + * Create a new Node from form metadata + * @param path path + * @param nodeType node type + * @param nameSpace namespace node + * @param data data to store + * @returns NodeMetadata + */ + public createNodeMetadata(nodeType: string, nameSpace: any, data: any, path: string, name?: string): Observable { + let properties = {}; + for (let key in data) { + if (data[key]) { + properties[nameSpace + ':' + key] = data[key]; + } + } + + return this.createNode(name || this.generateUuid(), nodeType, properties, path); + } + + /** + * Create a new Node from form metadata + * @param name path + * @param nodeType node type + * @param properties namespace node + * @param path path + * @returns NodeMetadata + */ + public createNode(name: string, nodeType: string, properties: any, path: string): Observable { + let body = { + name: name, + nodeType: nodeType, + properties: properties, + relativePath: path + }; + + return Observable.fromPromise(this.authService.getAlfrescoApi().nodes.addNode('-root-', body, {})); + } + + private generateUuid() { + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + let r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); + } + private cleanMetadataFromSemicolon(data: any): NodeMetadata { let metadata = {};