+ +
+Upload
@@ -160,6 +168,7 @@
[currentFolderPath]="currentPath"
[multipleFiles]="multipleFileUpload"
[uploadFolders]="folderUpload"
+ [versioning] = "versioning"
(onSuccess)="documentList.reload()">
@@ -171,6 +180,7 @@
acceptedFilesType="{{acceptedFilesType}}"
[multipleFiles]="multipleFileUpload"
[uploadFolders]="folderUpload"
+ [versioning] = "versioning"
(onSuccess)="documentList.reload()">
diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index 371536eb78..c6d8e3fad9 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -63,6 +63,7 @@ export class FilesComponent implements OnInit {
multipleFileUpload: boolean = false;
folderUpload: boolean = false;
acceptedFilesTypeShow: boolean = false;
+ versioning: boolean = false;
acceptedFilesType: string = '.jpg,.pdf,.js';
@@ -119,6 +120,11 @@ export class FilesComponent implements OnInit {
return this.acceptedFilesTypeShow;
}
+ toggleVersioning() {
+ this.versioning = !this.versioning;
+ return this.versioning;
+ }
+
ngOnInit() {
this.formService.getProcessDefinitions().subscribe(
defs => this.setupBpmActions(defs || []),
@@ -127,7 +133,7 @@ export class FilesComponent implements OnInit {
}
viewActivitiForm(event?: any) {
- this.router.navigate(['/activiti/tasks', '1']);
+ this.router.navigate(['/activiti/tasksnode', event.value.entry.id]);
}
private setupBpmActions(actions: any[]) {
diff --git a/demo-shell-ng2/app/components/search/search-bar.component.ts b/demo-shell-ng2/app/components/search/search-bar.component.ts
index a55f630e1c..318bfb7877 100644
--- a/demo-shell-ng2/app/components/search/search-bar.component.ts
+++ b/demo-shell-ng2/app/components/search/search-bar.component.ts
@@ -16,13 +16,9 @@
*/
import { Component, EventEmitter, Output } from '@angular/core';
-import { Router } from '@angular/router';
import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search';
import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer';
-import {
- AlfrescoAuthenticationService,
- AlfrescoContentService
-} from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
declare let __moduleName: string;
@@ -30,52 +26,36 @@ declare let __moduleName: string;
moduleId: __moduleName,
selector: 'search-bar',
templateUrl: './search-bar.component.html',
- styles: [`
- `],
- directives: [ ALFRESCO_SEARCH_DIRECTIVES, VIEWERCOMPONENT ]
+ directives: [ALFRESCO_SEARCH_DIRECTIVES, VIEWERCOMPONENT]
})
export class SearchBarComponent {
- urlFile: string;
- fileName: string;
- mimeType: string;
+ fileNodeId: string;
fileShowed: boolean = false;
+ searchTerm: string = '';
@Output()
expand = new EventEmitter();
- constructor(
- public router: Router,
- public auth: AlfrescoAuthenticationService,
- public contentService: AlfrescoContentService
-
- ) {
+ constructor(public auth: AlfrescoAuthenticationService) {
}
isLoggedIn(): boolean {
return this.auth.isLoggedIn();
}
- /**
- * Called when a new search term is submitted
- *
- * @param params Parameters relating to the search
- */
- searchTermChange(params) {
- this.router.navigate(['Search', {
- q: params.value
- }]);
- }
-
onFileClicked(event) {
if (event.value.entry.isFile) {
- this.fileName = event.value.entry.name;
- this.mimeType = event.value.entry.content.mimeType;
- this.urlFile = this.contentService.getContentUrl(event.value);
+ this.fileNodeId = event.value.entry.id;
this.fileShowed = true;
}
}
+ searchTermChange(event) {
+ console.log('Search term changed', event);
+ this.searchTerm = event.value;
+ }
+
onExpandToggle(event) {
this.expand.emit(event);
}
diff --git a/demo-shell-ng2/app/components/search/search.component.html b/demo-shell-ng2/app/components/search/search.component.html
index 93568e6b8d..d67a727047 100644
--- a/demo-shell-ng2/app/components/search/search.component.html
+++ b/demo-shell-ng2/app/components/search/search.component.html
@@ -3,6 +3,6 @@
-
-
Please select a Visit
+Please select a Task
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 4571c1a6a4..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
@@ -32,7 +32,7 @@ describe('ActivitiForm', () => {
let visibilityService: WidgetVisibilityService;
beforeEach(() => {
- componentHandler = jasmine.createSpyObj('componentHandler', [
+ componentHandler = jasmine.createSpyObj('componentHandler', [
'upgradeAllRegistered'
]);
visibilityService = jasmine.createSpyObj('WidgetVisibilityService', [
@@ -40,8 +40,8 @@ describe('ActivitiForm', () => {
]);
window['componentHandler'] = componentHandler;
- formService = new FormService(null);
- formComponent = new ActivitiForm(formService, visibilityService);
+ formService = new FormService(null, null);
+ formComponent = new ActivitiForm(formService, visibilityService, null, null, null);
});
it('should upgrade MDL content on view checked', () => {
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 69865b8a1c..d763eb0128 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
@@ -23,9 +23,10 @@ import {
Output,
EventEmitter
} from '@angular/core';
-import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
-
+import { MATERIAL_DESIGN_DIRECTIVES, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { EcmModelService } from './../services/ecm-model.service';
import { FormService } from './../services/form.service';
+import { NodeService } from './../services/node.service';
import { FormModel, FormOutcomeModel, FormValues, FormFieldModel, FormOutcomeEvent } from './widgets/core/index';
import { TabsWidget } from './widgets/tabs/tabs.widget';
@@ -38,19 +39,23 @@ import { WidgetVisibilityService } from './../services/widget-visibility.servic
/**
* @Input
- * ActivitiForm can show 3 forms searching by 3 type of params:
+ * ActivitiForm can show 4 types of forms searching by 4 type of params:
* 1) Form attached to a task passing the {taskId}.
+ *
* 2) Form that are only defined with the {formId} (in this case you receive only the form definition and the form will not be
* attached to any process, useful in case you want to use ActivitiForm as form designer), in this case you can pass also other 2
* parameters:
* - {saveOption} as parameter to tell what is the function to call on the save action.
* - {data} to fill the form field with some data, the id of the form must to match the name of the field of the provided data object.
+ *
* 3) Form that are only defined with the {formName} (in this case you receive only the form definition and the form will not be
* attached to any process, useful in case you want to use ActivitiForm as form designer),
* in this case you can pass also other 2 parameters:
* - {saveOption} as parameter to tell what is the function to call on the save action.
* - {data} to fill the form field with some data, the id of the form must to match the name of the field of the provided data object.
*
+ * 4) Form that show the metadata of a {nodeId}
+ *
* {showTitle} boolean - to hide the title of the form pass false, default true;
*
* {showRefreshButton} boolean - to hide the refresh button of the form pass false, default true;
@@ -59,6 +64,12 @@ import { WidgetVisibilityService } from './../services/widget-visibility.servic
*
* {showSaveButton} boolean - to hide the save button of the form pass false, default true;
*
+ * {saveMetadata} boolean - store the value of the form as metadata, default false;
+ *
+ * {path} string - path of the folder where to store the metadata;
+ *
+ * {nameNode} string (optional) - Name to assign to the new node where the metadata are stored;
+ *
* @Output
* {formLoaded} EventEmitter - This event is fired when the form is loaded, it pass all the value in the form.
* {formSaved} EventEmitter - This event is fired when the form is saved, it pass all the value in the form.
@@ -72,7 +83,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]
+ providers: [EcmModelService, FormService, WidgetVisibilityService, NodeService]
})
export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
@@ -83,15 +94,27 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
@Input()
taskId: string;
+ @Input()
+ nodeId: string;
+
@Input()
formId: string;
@Input()
formName: string;
+ @Input()
+ saveMetadata: boolean = false;
+
@Input()
data: FormValues;
+ @Input()
+ path: string;
+
+ @Input()
+ nameNode: string;
+
@Input()
showTitle: boolean = true;
@@ -124,7 +147,10 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
debugMode: boolean = false;
constructor(private formService: FormService,
- private visibilityService: WidgetVisibilityService) {
+ private visibilityService: WidgetVisibilityService,
+ private authService: AlfrescoAuthenticationService,
+ private ecmModelService: EcmModelService,
+ private nodeService: NodeService) {
}
hasForm(): boolean {
@@ -154,7 +180,11 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
}
ngOnInit() {
- this.loadForm();
+ if (this.nodeId) {
+ this.loadActivitiFormForEcmNode();
+ } else {
+ this.loadForm();
+ }
}
ngAfterViewChecked() {
@@ -208,6 +238,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
if (outcome.id === ActivitiForm.CUSTOM_OUTCOME_ID) {
this.formSaved.emit(this.form);
+ this.storeFormAsMetadata();
return true;
}
} else {
@@ -275,7 +306,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);
},
@@ -306,7 +337,10 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
this.formService
.saveTaskForm(this.form.taskId, this.form.values)
.subscribe(
- () => this.formSaved.emit(this.form),
+ () => {
+ this.formSaved.emit(this.form);
+ this.storeFormAsMetadata();
+ },
this.handleError
);
}
@@ -317,13 +351,16 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
this.formService
.completeTaskForm(this.form.taskId, this.form.values, outcome)
.subscribe(
- () => this.formCompleted.emit(this.form),
+ () => {
+ this.formCompleted.emit(this.form);
+ this.storeFormAsMetadata();
+ },
this.handleError
);
}
}
- handleError(err: any) {
+ handleError(err: any): any {
console.log(err);
}
@@ -345,7 +382,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
*/
getFormDefinitionOutcomes(form: FormModel): FormOutcomeModel[] {
return [
- new FormOutcomeModel(form, { id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true })
+ new FormOutcomeModel(form, {id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true})
];
}
@@ -354,4 +391,41 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
this.visibilityService.updateVisibilityForForm(field.form);
}
}
+
+ private loadActivitiFormForEcmNode(): void {
+ this.nodeService.getNodeMetadata(this.nodeId).subscribe(data => {
+ this.data = data.metadata;
+ this.loadFormFromActiviti(data.nodeType);
+ },
+ this.handleError);
+ }
+
+ public loadFormFromActiviti(nodeType: string): any {
+ this.formService.searchFrom(nodeType).subscribe(
+ form => {
+ if (!form) {
+ this.formService.createFormFromNodeType(nodeType).subscribe(formMetadata => {
+ this.loadFormFromFormId(formMetadata.id);
+ });
+ } else {
+ this.loadFormFromFormId(form.id);
+ }
+ },
+ this.handleError
+ );
+ }
+
+ private loadFormFromFormId(formId: string) {
+ this.formId = formId;
+ this.loadForm();
+ }
+
+ private storeFormAsMetadata() {
+ if (this.saveMetadata) {
+ this.ecmModelService.createEcmTypeForActivitiForm(this.formName, this.form).subscribe(type => {
+ this.nodeService.createNodeMetadata(type.nodeType || type.entry.prefixedName, EcmModelService.MODEL_NAMESPACE, this.form.values, this.path, this.nameNode);
+ }, this.handleError
+ );
+ }
+ }
}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html
index bd2732ddc4..6cffc9730c 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html
@@ -43,6 +43,9 @@
, name: }
- */
- if (this.value === 'empty' || this.value === '') {
- this.form.values[this.id] = {};
- } else {
+
+ switch (this.type) {
+ case FormFieldTypes.DROPDOWN:
+ /*
+ This is needed due to Activiti reading dropdown values as string
+ but saving back as object: { id: , name: }
+ */
+ if (this.value === 'empty' || this.value === '') {
+ this.form.values[this.id] = {};
+ } else {
+ let entry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value);
+ if (entry.length > 0) {
+ this.form.values[this.id] = entry[0];
+ }
+ }
+ break;
+ case FormFieldTypes.RADIO_BUTTONS:
+ /*
+ This is needed due to Activiti issue related to reading radio button values as value string
+ but saving back as object: { id: , name: }
+ */
let entry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value);
if (entry.length > 0) {
this.form.values[this.id] = entry[0];
+ } else if (this.options.length > 0) {
+ this.form.values[this.id] = this.options[0];
+ }
+ break;
+ case FormFieldTypes.UPLOAD:
+ if (this.value && this.value.length > 0) {
+ this.form.values[this.id] = `${this.value[0].id}`;
+ } else {
+ this.form.values[this.id] = null;
+ }
+ break;
+ default:
+ if (!FormFieldTypes.isReadOnlyType(this.type)) {
+ this.form.values[this.id] = this.value;
}
- }
- } else if (this.type === FormFieldTypes.RADIO_BUTTONS) {
- /*
- This is needed due to Activiti issue related to reading radio button values as value string
- but saving back as object: { id: , name: }
- */
- let entry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value);
- if (entry.length > 0) {
- this.form.values[this.id] = entry[0];
- } else if (this.options.length > 0) {
- this.form.values[this.id] = this.options[0];
- }
- } else {
- if (!FormFieldTypes.isReadOnlyType(this.type)) {
- this.form.values[this.id] = this.value;
- }
}
}
}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html
index 3da33231b0..a6c3d50a94 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html
@@ -1,4 +1,5 @@
+
UNKNOWN WIDGET TYPE: {{field.type}}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts
index e01b261033..627bcfe5d2 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts
@@ -23,6 +23,7 @@ export class FormFieldTypes {
static RADIO_BUTTONS: string = 'radio-buttons';
static DISPLAY_VALUE: string = 'readonly';
static READONLY_TEXT: string = 'readonly-text';
+ static UPLOAD: string = 'upload';
static READONLY_TYPES: string[] = [
FormFieldTypes.HYPERLINK,
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
index 916c8714df..22bd3822ae 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
@@ -129,34 +129,45 @@ export class FormFieldModel extends FormWidgetModel {
}
updateForm() {
- if (this.type === FormFieldTypes.DROPDOWN) {
- /*
- This is needed due to Activiti reading dropdown values as string
- but saving back as object: { id:
+
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
index 9e5d480583..51ceb74e05 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
@@ -27,6 +27,7 @@ import { HyperlinkWidget } from './hyperlink/hyperlink.widget';
import { RadioButtonsWidget } from './radio-buttons/radio-buttons.widget';
import { DisplayValueWidget } from './display-value/display-value.widget';
import { DisplayTextWidget } from './display-text/display-text.widget';
+import { UploadWidget } from './upload/upload.widget';
// core
export * from './widget.component';
@@ -46,6 +47,7 @@ export * from './hyperlink/hyperlink.widget';
export * from './radio-buttons/radio-buttons.widget';
export * from './display-value/display-value.widget';
export * from './display-text/display-text.widget';
+export * from './upload/upload.widget';
export const CONTAINER_WIDGET_DIRECTIVES: [any] = [
TabsWidget,
@@ -61,7 +63,8 @@ export const PRIMITIVE_WIDGET_DIRECTIVES: [any] = [
HyperlinkWidget,
RadioButtonsWidget,
DisplayValueWidget,
- DisplayTextWidget
+ DisplayTextWidget,
+ UploadWidget
];
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css
new file mode 100644
index 0000000000..1735deb447
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css
@@ -0,0 +1,17 @@
+.upload-widget {
+ width:100%
+}
+
+.upload-widget__icon {
+ float: left;
+}
+
+.upload-widget__file {
+ float: left;
+ margin-top: 4px;
+}
+
+.upload-widget__reset {
+ float: left;
+ margin-top: 4px;
+}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html
new file mode 100644
index 0000000000..f5fdaabb25
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html
@@ -0,0 +1,15 @@
+
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts
new file mode 100644
index 0000000000..2edf60dd6c
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.ts
@@ -0,0 +1,105 @@
+/*!
+ * @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 { WidgetComponent } from './../widget.component';
+import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+
+declare let __moduleName: string;
+declare var componentHandler;
+
+@Component({
+ moduleId: __moduleName,
+ selector: 'upload-widget',
+ templateUrl: './upload.widget.html',
+ styleUrls: ['./upload.widget.css']
+})
+export class UploadWidget extends WidgetComponent implements OnInit {
+
+ constructor(private settingsService: AlfrescoSettingsService,
+ private authService: AlfrescoAuthenticationService) {
+ super();
+ }
+
+ hasFile: boolean;
+ fileName: string;
+
+ ngOnInit() {
+ if (this.field &&
+ this.field.value &&
+ this.field.value.length > 0) {
+ this.hasFile = true;
+ }
+ }
+
+ getUploadedFileName(): string {
+ let result = this.fileName;
+
+ if (this.field &&
+ this.field.value &&
+ this.field.value.length > 0) {
+ let file = this.field.value[0];
+ result = file.name;
+ }
+
+ return result;
+ }
+
+ reset() {
+ this.field.value = null;
+ this.field.json.value = null;
+ this.hasFile = false;
+ }
+
+ onFileChanged(event: any) {
+ let files = event.srcElement.files;
+ if (files && files.length > 0) {
+
+ let file = files[0];
+
+ this.hasFile = true;
+ this.fileName = file.name;
+
+ let formData: FormData = new FormData();
+ formData.append('file', file, file.name);
+
+ let xhr: XMLHttpRequest = new XMLHttpRequest();
+
+ xhr.withCredentials = true;
+
+ xhr.onreadystatechange = () => {
+ if (xhr.readyState === 4) {
+ if (xhr.status === 200) {
+ let jsonFile = JSON.parse(xhr.response);
+ console.log(jsonFile);
+ this.field.value = [jsonFile];
+ this.field.json.value = [jsonFile];
+ } else {
+ console.error(xhr.response);
+ window.alert('Error uploading file. See console output for more details.');
+ }
+ }
+ };
+
+ let url = `${this.settingsService.bpmHost}/activiti-app/app/rest/content/raw`;
+ xhr.open('POST', url, true);
+ xhr.setRequestHeader('Authorization', this.authService.getTicketBpm());
+ xhr.send(formData);
+ }
+ }
+
+}
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
new file mode 100644
index 0000000000..fd7fd95b8e
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/models/form-definition.model.ts
@@ -0,0 +1,95 @@
+/*!
+ * @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 class FormDefinitionModel {
+ reusable: boolean = false;
+ newVersion: boolean = false;
+ formRepresentation: any;
+ formImageBase64: string = '';
+
+ constructor(id: string, name: any, lastUpdatedByFullName: string, lastUpdated: string, metadata: any) {
+
+ this.formRepresentation = {
+ id: id,
+ name: name,
+ description: '',
+ version: 1,
+ lastUpdatedBy: 1,
+ lastUpdatedByFullName: lastUpdatedByFullName,
+ lastUpdated: lastUpdated,
+ stencilSetId: 0,
+ referenceId: null,
+ formDefinition: {
+ fields: [{
+ name: 'Label',
+ type: 'container',
+ fieldType: 'ContainerRepresentation',
+ numberOfColumns: 2,
+ required: false,
+ readOnly: false,
+ sizeX: 2,
+ sizeY: 1,
+ row: -1,
+ col: -1,
+ fields: {'1': this.metadataToFields(metadata)}
+ }],
+ gridsterForm: false,
+ javascriptEvents: [],
+ metadata: {},
+ outcomes: [],
+ className: '',
+ style: '',
+ tabs: [],
+ variables: []
+ }
+ };
+ }
+
+ private metadataToFields(metadata: any): any[] {
+ let fields = [];
+ if (metadata) {
+ metadata.forEach(function(property) {
+ if (property) {
+ let field = {
+ type: 'text',
+ id: property.name,
+ name: property.name,
+ required: false,
+ readOnly: false,
+ sizeX: 1,
+ sizeY: 1,
+ row: -1,
+ col: -1,
+ colspan: 1,
+ params: {
+ existingColspan: 1,
+ maxColspan: 2
+ },
+ layout: {
+ colspan: 1,
+ row: -1,
+ column: -1
+ }
+ };
+ fields.push(field);
+ }
+ });
+ }
+
+ return fields;
+ }
+}
diff --git a/ng2-components/ng2-activiti-form/src/models/node-metadata.model.ts b/ng2-components/ng2-activiti-form/src/models/node-metadata.model.ts
new file mode 100644
index 0000000000..35254e8a7b
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/models/node-metadata.model.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 class NodeMetadata {
+ metadata: any;
+ nodeType: string;
+
+ constructor(metadata: any, nodeType: string) {
+ this.metadata = metadata;
+ this.nodeType = nodeType;
+ }
+}
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
new file mode 100644
index 0000000000..9c9f4437d3
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.ts
@@ -0,0 +1,262 @@
+/*!
+ * @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';
+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,
+ private nodeService: NodeService) {
+ }
+
+ 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.searchEcmType(formName, EcmModelService.MODEL_NAME).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 searchEcmType(typeName: string, modelName: string): Observable {
+ return this.getEcmType(modelName).map(function (customTypes: any) {
+ return customTypes.list.entries.find(type => type.entry.prefixedName === typeName || type.entry.title === typeName);
+ });
+ }
+
+ public activeEcmModel(modelName: string): Observable {
+ let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm/${modelName}?select=status`;
+ let options = this.getRequestOptions();
+
+
+ let body = {status: 'ACTIVE'};
+
+ return this.http
+ .put(url, body, options)
+ .map(this.toJson)
+ .catch(this.handleError);
+ }
+
+ public createEcmModel(modelName: string, nameSpace: string): Observable {
+ let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm`;
+ let options = this.getRequestOptions();
+
+
+ let body = {
+ status: 'DRAFT', namespaceUri: modelName, namespacePrefix: nameSpace, name: modelName, description: '', author: ''
+ };
+
+ return this.http
+ .post(url, body, options)
+ .map(this.toJson)
+ .catch(this.handleError);
+ }
+
+ public getEcmModels(): Observable {
+ let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm`;
+ let options = this.getRequestOptions();
+
+ return this.http
+ .get(url, options)
+ .map(this.toJson)
+ .catch(this.handleError);
+ }
+
+
+ public getEcmType(modelName: string): Observable {
+ let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm/${modelName}/types`;
+ let options = this.getRequestOptions();
+
+ return this.http
+ .get(url, options)
+ .map(this.toJson)
+ .catch(this.handleError);
+ }
+
+ public createEcmType(typeName: string, modelName: string, parentType: string): Observable {
+ let name = this.cleanNameType(typeName);
+ let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm/${modelName}/types`;
+ let options = this.getRequestOptions();
+
+ let body = {
+ name: name,
+ parentName: parentType,
+ title: typeName,
+ description: ''
+ };
+
+ return this.http
+ .post(url, body, options)
+ .map(this.toJson)
+ .catch(this.handleError);
+ }
+
+ public addPropertyToAType(modelName: string, typeName: string, formFields: any) {
+ let name = this.cleanNameType(typeName);
+ let url = `${this.alfrescoSettingsService.ecmHost}/alfresco/api/-default-/private/alfresco/versions/1/cmm/${modelName}/types/${name}?select=props`;
+ let options = this.getRequestOptions();
+
+ let properties = [];
+ if (formFields && formFields.values) {
+ for (let key in formFields.values) {
+ if (key) {
+ properties.push({
+ name: key,
+ title: key,
+ description: key,
+ dataType: 'd:text',
+ multiValued: false,
+ mandatory: false,
+ mandatoryEnforced: false
+ });
+ }
+ }
+ }
+
+ let body = {
+ name: name,
+ properties: properties
+ };
+
+ return this.http
+ .put(url, body, options)
+ .map(this.toJson)
+ .catch(this.handleError);
+ }
+
+ public cleanNameType(name: string): string {
+ let cleanName = name;
+ if (name.indexOf(':') !== -1) {
+ cleanName = name.split(':')[1];
+ }
+ return cleanName.replace(/[^a-zA-Z ]/g, '');
+ }
+
+ public getHeaders(): Headers {
+ return new Headers({
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'Authorization': this.authService.getTicketEcmBase64()
+ });
+ }
+
+ public getRequestOptions(): RequestOptions {
+ let headers = this.getHeaders();
+ return new RequestOptions({headers: headers});
+ }
+
+ toJson(res: Response) {
+ if (res) {
+ let body = res.json();
+ return body || {};
+ }
+ return {};
+ }
+
+ handleError(err: any): any {
+ console.log(err);
+ }
+}
diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
index 9f389698e1..a93a0abe25 100644
--- a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
@@ -17,8 +17,10 @@
import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
-import { Response, ResponseOptions } from '@angular/http';
+import { HTTP_PROVIDERS, Response, ResponseOptions } from '@angular/http';
import { FormService } from './form.service';
+import { EcmModelService } from './ecm-model.service';
+import { NodeService } from './node.service';
declare let jasmine: any;
@@ -30,7 +32,10 @@ describe('FormService', () => {
return [
FormService,
AlfrescoSettingsService,
- AlfrescoAuthenticationService
+ AlfrescoAuthenticationService,
+ EcmModelService,
+ HTTP_PROVIDERS,
+ NodeService
];
});
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 8ff0e5eda5..a5f33bc003 100644
--- a/ng2-components/ng2-activiti-form/src/services/form.service.ts
+++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs/Rx';
-import {AlfrescoAuthenticationService} from 'ng2-alfresco-core';
-import {FormValues} from './../components/widgets/core/index';
+import { Injectable } from '@angular/core';
+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 {
@@ -26,28 +28,127 @@ 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) {
}
- getProcessDefinitions(): Observable {
+ /**
+ * Create a Form with a fields for each metadata properties
+ * @returns {Observable}
+ */
+ public createFormFromNodeType(formName: string): Observable {
+ return Observable.create(observer => {
+ this.createForm(formName).subscribe(
+ form => {
+ this.ecmModelService.searchEcmType(formName, EcmModelService.MODEL_NAME).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);
+ });
+ }
+
+ /**
+ * Create a Form
+ * @returns {Observable}
+ */
+ public createForm(formName: string): Observable {
+ let dataModel = {
+ name: formName,
+ description: '',
+ modelType: 2,
+ stencilSet: 0
+ };
+
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.modelsApi.createModel(dataModel));
+ }
+
+ /**
+ * Add Fields to A form from a metadata properties
+ * @returns {Observable}
+ */
+ public addFieldsNodeTypePropertiesToTheForm(formId: string, formDefinitionModel: FormDefinitionModel): Observable {
+ return this.addFieldsToAForm(formId, formDefinitionModel);
+ }
+
+ /**
+ * Add Fileds to A form
+ * @returns {Observable}
+ */
+ public addFieldsToAForm(formId: string, formModel: FormDefinitionModel): Observable {
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.editorApi.saveForm(formId, formModel));
+ }
+
+ /**
+ * Search For A Form by name
+ * @returns {Observable}
+ */
+ public searchFrom(name: string): Observable {
+ let opts = {
+ 'modelType': 2
+ };
+
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.modelsApi.getModels(opts)).map(function (forms: any) {
+ return forms.data.find(formdata => formdata.name === name);
+ }).catch(this.handleError);
+ }
+
+ /**
+ * Get All the forms
+ * @returns {Observable}
+ */
+ public getForms(): Observable {
+ let opts = {
+ 'modelType': 2
+ };
+
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.modelsApi.getModels(opts));
+ }
+
+ /**
+ * Get Process Definition
+ * @returns {Observable}
+ */
+ public getProcessDefinitions(): Observable {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.processApi.getProcessDefinitions({}))
.map(this.toJsonArray)
.catch(this.handleError);
}
- getTasks(): Observable {
+ /**
+ * Get All the Tasks
+ * @param taskId Task Id
+ * @returns {Observable}
+ */
+ public getTasks(): Observable {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.taskApi.listTasks({}))
.map(this.toJsonArray)
.catch(this.handleError);
}
- getTask(taskId: string): Observable {
+ /**
+ * Get Task
+ * @param taskId Task Id
+ * @returns {Observable}
+ */
+ public getTask(taskId: string): Observable {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.taskApi.getTask(taskId))
.map(this.toJson)
.catch(this.handleError);
}
- saveTaskForm(taskId: string, formValues: FormValues): Observable {
+ /**
+ * Save Task Form
+ * @param taskId Task Id
+ * @param formValues Form Values
+ * @returns {Observable}
+ */
+ public saveTaskForm(taskId: string, formValues: FormValues): Observable {
let body = JSON.stringify({values: formValues});
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.taskApi.saveTaskForm(taskId, body))
@@ -59,9 +160,9 @@ export class FormService {
* @param taskId Task Id
* @param formValues Form Values
* @param outcome Form Outcome
- * @returns {any}
+ * @returns {Observable}
*/
- completeTaskForm(taskId: string, formValues: FormValues, outcome?: string): Observable {
+ public completeTaskForm(taskId: string, formValues: FormValues, outcome?: string): Observable {
let data: any = {values: formValues};
if (outcome) {
data.outcome = outcome;
@@ -72,13 +173,23 @@ export class FormService {
.catch(this.handleError);
}
- getTaskForm(taskId: string): Observable {
+ /**
+ * Get Form related to a taskId
+ * @param taskId Task Id
+ * @returns {Observable}
+ */
+ public getTaskForm(taskId: string): Observable {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.taskApi.getTaskForm(taskId))
.map(this.toJson)
.catch(this.handleError);
}
- getFormDefinitionById(formId: string): Observable {
+ /**
+ * Get Form Definition
+ * @param formId Form Id
+ * @returns {Observable}
+ */
+ public getFormDefinitionById(formId: string): Observable {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.editorApi.getForm(formId))
.map(this.toJson)
.catch(this.handleError);
@@ -89,7 +200,7 @@ export class FormService {
* @param name
* @returns {Promise|Promise}
*/
- getFormDefinitionByName(name: string): Observable {
+ public getFormDefinitionByName(name: string): Observable {
let opts = {
'filter': 'myReusableForms',
'filterText': name,
diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.ts b/ng2-components/ng2-activiti-form/src/services/node.service.ts
new file mode 100644
index 0000000000..10a9c39815
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/services/node.service.ts
@@ -0,0 +1,96 @@
+/*!
+ * @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';
+import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { Observable } from 'rxjs/Rx';
+import { NodeMetadata } from '../models/node-metadata.model';
+
+@Injectable()
+export class NodeService {
+
+ constructor(private authService: AlfrescoAuthenticationService) {
+ }
+
+ /**
+ * Get All the metadata and the nodeType for a nodeId cleaned by the prefix
+ * @param nodeId Node Id
+ * @returns NodeMetadata
+ */
+ public getNodeMetadata(nodeId: string): Observable {
+ 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 = {};
+
+ if (data && data.properties) {
+ for (let key in data.properties) {
+ if (key) {
+ metadata [key.split(':')[1]] = data.properties[key];
+ }
+ }
+ }
+
+ return new NodeMetadata(metadata, data.nodeType);
+ }
+}
diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
index f83c5bc803..3e1b9f62b8 100644
--- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
@@ -236,6 +236,7 @@ describe('WidgetVisibilityService', () => {
expect(varValue).toBe('form_value_test');
});
+ /*
it('should return null if the variable does not exist', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
@@ -252,6 +253,7 @@ describe('WidgetVisibilityService', () => {
expect(varValue).toBe(null);
});
+ */
it('should be able to retrieve a field value searching in the form', () => {
let stubFormWithFields = new FormModel(fakeFormJson);
@@ -360,6 +362,7 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).toBe(null);
});
+ /*
it('should retrieve the value for the left field when it is a process variable', (variableUpdated) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
@@ -379,6 +382,7 @@ 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: [
@@ -484,6 +488,7 @@ describe('WidgetVisibilityService', () => {
expect(isVisible).toBeTruthy();
});
+ /*
it('should evaluate visibility with multiple conditions', (ready) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => {
@@ -510,6 +515,7 @@ describe('WidgetVisibilityService', () => {
expect(isVisible).toBeTruthy();
});
+ */
it('should return true when the visibility condition is not valid', () => {
let visibilityObjTest = new WidgetVisibilityModel();
diff --git a/ng2-components/ng2-activiti-processlist/.gitignore b/ng2-components/ng2-activiti-processlist/.gitignore
index 3bea8a0c07..8987ee1a87 100644
--- a/ng2-components/ng2-activiti-processlist/.gitignore
+++ b/ng2-components/ng2-activiti-processlist/.gitignore
@@ -10,4 +10,6 @@ src/**/*.d.ts
demo/**/*.js
demo/**/*.js.map
demo/**/*.d.ts
+index.js
+index.js.map
!systemjs.config.js
diff --git a/ng2-components/ng2-activiti-processlist/data/processlist-datatable-adapter.ts b/ng2-components/ng2-activiti-processlist/data/processlist-datatable-adapter.ts
new file mode 100644
index 0000000000..b3e39360f4
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/data/processlist-datatable-adapter.ts
@@ -0,0 +1,123 @@
+/*!
+ * @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 { DatePipe } from '@angular/common';
+import {
+ DataTableAdapter, ObjectDataTableAdapter, ObjectDataColumn,
+ DataRow, DataColumn, DataSorting
+} from 'ng2-alfresco-datatable';
+
+export class ProcessListDataTableAdapter extends ObjectDataTableAdapter implements DataTableAdapter {
+
+ ERR_ROW_NOT_FOUND: string = 'Row not found';
+ ERR_COL_NOT_FOUND: string = 'Column not found';
+
+ DEFAULT_DATE_FORMAT: string = 'medium';
+
+ private sorting: DataSorting;
+ private rows: DataRow[];
+ private columns: DataColumn[];
+
+ constructor(rows: any, schema: DataColumn[]) {
+ super(rows, schema);
+ this.rows = rows;
+ this.columns = schema || [];
+ }
+
+ getRows(): Array {
+ return this.rows;
+ }
+
+ // TODO: disable this api
+ setRows(rows: Array) {
+ this.rows = rows || [];
+ this.sort();
+ }
+
+ getColumns(): Array {
+ return this.columns;
+ }
+
+ setColumns(columns: Array) {
+ this.columns = columns || [];
+ }
+
+ getValue(row: DataRow, col: DataColumn): any {
+ if (!row) {
+ throw new Error(this.ERR_ROW_NOT_FOUND);
+ }
+ if (!col) {
+ throw new Error(this.ERR_COL_NOT_FOUND);
+ }
+ let value = row.getValue(col.key);
+
+ if (col.type === 'date') {
+ let datePipe = new DatePipe();
+ let format = ((col)).format || this.DEFAULT_DATE_FORMAT;
+ try {
+ return datePipe.transform(value, format);
+ } catch (err) {
+ console.error(`Error parsing date ${value} to format ${format}`);
+ }
+ }
+
+ return value;
+ }
+
+ getSorting(): DataSorting {
+ return this.sorting;
+ }
+
+ setSorting(sorting: DataSorting): void {
+ this.sorting = sorting;
+
+ if (sorting && sorting.key && this.rows && this.rows.length > 0) {
+ this.rows.sort((a: DataRow, b: DataRow) => {
+ let left = a.getValue(sorting.key);
+ if (left) {
+ left = (left instanceof Date) ? left.valueOf().toString() : left.toString();
+ } else {
+ left = '';
+ }
+
+ let right = b.getValue(sorting.key);
+ if (right) {
+ right = (right instanceof Date) ? right.valueOf().toString() : right.toString();
+ } else {
+ right = '';
+ }
+
+ return sorting.direction === 'asc'
+ ? left.localeCompare(right)
+ : right.localeCompare(left);
+ });
+ }
+ }
+
+ sort(key?: string, direction?: string): void {
+ let sorting = this.sorting || new DataSorting();
+ if (key) {
+ sorting.key = key;
+ sorting.direction = direction || 'asc';
+ }
+ this.setSorting(sorting);
+ }
+}
+
+export class ActivitiDataColumn extends ObjectDataColumn {
+ format: string;
+}
diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json
index fcc6e823e2..7ae9e5c90d 100644
--- a/ng2-components/ng2-activiti-processlist/demo/package.json
+++ b/ng2-components/ng2-activiti-processlist/demo/package.json
@@ -39,7 +39,7 @@
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12",
- "ng2-activiti-processlist": "file:../",
+ "ng2-activiti-processlist": "^0.3.0",
"material-design-icons": "^2.2.3",
"material-design-lite": "^1.1.3"
},
diff --git a/ng2-components/ng2-activiti-processlist/demo/src/main.ts b/ng2-components/ng2-activiti-processlist/demo/src/main.ts
index 36900923c0..9d3c4df947 100644
--- a/ng2-components/ng2-activiti-processlist/demo/src/main.ts
+++ b/ng2-components/ng2-activiti-processlist/demo/src/main.ts
@@ -44,7 +44,7 @@ import {
;
+ comment$: Observable;
+
+ message: string;
+
+ /**
+ * Constructor
+ * @param auth
+ * @param translate
+ */
+ constructor(private auth: AlfrescoAuthenticationService,
+ private translate: AlfrescoTranslationService,
+ private activitiProcess: ActivitiProcessService) {
+
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
+ }
+
+ this.comment$ = new Observable(observer => this.commentObserver = observer).share();
+
+ }
+
+ ngOnInit() {
+ this.comment$.subscribe((comment: Comment) => {
+ this.comments.push(comment);
+ });
+
+ if (this.processId) {
+ this.load(this.processId);
+ }
+ }
+
+ public load(taskId: string) {
+ this.comments = [];
+ if (this.processId) {
+ this.activitiProcess.getProcessInstanceComments(this.processId).subscribe(
+ (res: Comment[]) => {
+ res.forEach((comment) => {
+ this.commentObserver.next(comment);
+ });
+ },
+ (err) => {
+ console.log(err);
+ }
+ );
+ } else {
+ this.comments = [];
+ }
+ }
+
+ public showDialog() {
+ if (this.dialog) {
+ this.dialog.nativeElement.showModal();
+ }
+ }
+
+ public add() {
+ this.activitiProcess.addProcessInstanceComment(this.processId, this.message).subscribe(
+ (res: Comment) => {
+ this.comments.push(res);
+ this.message = '';
+ },
+ (err) => {
+ console.log(err);
+ }
+ );
+ this.cancel();
+ }
+
+ public cancel() {
+ if (this.dialog) {
+ this.dialog.nativeElement.close();
+ }
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.css
new file mode 100644
index 0000000000..6b7e0a7a66
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.css
@@ -0,0 +1,3 @@
+.mdl-list__item {
+ cursor: pointer;
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.html
new file mode 100644
index 0000000000..580798c6a3
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.html
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
new file mode 100644
index 0000000000..9032d2f173
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
@@ -0,0 +1,131 @@
+/*!
+ * @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, Output, EventEmitter, OnInit, Input } from '@angular/core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
+import { ActivitiProcessService } from './../services/activiti-process.service';
+import { FilterModel } from '../models/filter.model';
+import { Observer } from 'rxjs/Observer';
+import { Observable } from 'rxjs/Observable';
+
+declare let componentHandler: any;
+declare let __moduleName: string;
+
+@Component({
+ selector: 'activiti-process-filters',
+ moduleId: __moduleName,
+ templateUrl: './activiti-filters.component.html',
+ styleUrls: ['activiti-filters.component.css'],
+ providers: [ActivitiProcessService],
+ pipes: [AlfrescoPipeTranslate]
+
+})
+export class ActivitiProcessFilters implements OnInit {
+
+ @Output()
+ filterClick: EventEmitter = new EventEmitter();
+
+ @Output()
+ onSuccess: EventEmitter = new EventEmitter();
+
+ @Output()
+ onError: EventEmitter = new EventEmitter();
+
+ @Input()
+ appId: string;
+
+ @Input()
+ appName: string;
+
+ private filterObserver: Observer;
+ filter$: Observable;
+
+ currentFilter: FilterModel;
+
+ filters: FilterModel [] = [];
+
+ /**
+ * Constructor
+ * @param auth
+ * @param translate
+ * @param activiti
+ */
+ constructor(private auth: AlfrescoAuthenticationService,
+ private translate: AlfrescoTranslationService,
+ public activiti: ActivitiProcessService) {
+ this.filter$ = new Observable(observer => this.filterObserver = observer).share();
+
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
+ }
+ }
+
+ ngOnInit() {
+ this.filter$.subscribe((filter: FilterModel) => {
+ this.filters.push(filter);
+ });
+
+ this.load();
+ }
+
+ /**
+ * The method call the adapter data table component for render the task list
+ * @param tasks
+ */
+ private load() {
+ if (this.appName) {
+ this.filterByAppName();
+ } else {
+ this.filterByAppId(this.appId);
+ }
+ }
+
+ private filterByAppId(appId) {
+ this.activiti.getProcessFilters(appId).subscribe(
+ (res: FilterModel[]) => {
+ res.forEach((filter) => {
+ this.filterObserver.next(filter);
+ });
+ this.onSuccess.emit(res);
+ },
+ (err) => {
+ console.log(err);
+ this.onError.emit(err);
+ }
+ );
+ }
+
+ private filterByAppName() {
+ this.activiti.getDeployedApplications(this.appName).subscribe(
+ application => {
+ this.filterByAppId(application.id);
+ },
+ (err) => {
+ console.log(err);
+ this.onError.emit(err);
+ });
+ }
+
+ /**
+ * Pass the selected filter as next
+ * @param filter
+ */
+ public selectFilter(filter: FilterModel) {
+ this.currentFilter = filter;
+ this.filterClick.emit(filter);
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css
new file mode 100644
index 0000000000..07eaf92d80
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css
@@ -0,0 +1,3 @@
+:host {
+ width: 100%;
+}
\ No newline at end of file
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
new file mode 100644
index 0000000000..741dcabc47
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
@@ -0,0 +1,13 @@
+;
+ private completedTaskObserver: Observer;
+
+ task$: Observable;
+ completedTask$: Observable;
+
+ message: string;
+
+ selectedTaskId: string;
+
+ @ViewChild('dialog')
+ dialog: any;
+
+ @ViewChild('taskdetails')
+ taskdetails: any;
+
+ /**
+ * Constructor
+ * @param auth
+ * @param translate
+ * @param activitiProcess
+ */
+ constructor(private auth: AlfrescoAuthenticationService,
+ private translate: AlfrescoTranslationService,
+ private activitiProcess: ActivitiProcessService) {
+
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
+ }
+
+ this.task$ = new Observable(observer => this.taskObserver = observer).share();
+ this.completedTask$ = new Observable(observer => this.completedTaskObserver = observer).share();
+
+ }
+
+ ngOnInit() {
+ this.task$.subscribe((task: TaskDetailsModel) => {
+ this.activeTasks.push(task);
+ });
+ this.completedTask$.subscribe((task: TaskDetailsModel) => {
+ this.completedTasks.push(task);
+ });
+
+ if (this.processId) {
+ this.load(this.processId);
+ }
+ }
+
+ public load(processId: string) {
+ this.loadActive(processId);
+ this.loadCompleted(processId);
+ }
+
+ public loadActive(processId: string) {
+ this.activeTasks = [];
+ if (processId) {
+ this.activitiProcess.getProcessTasks(processId, null).subscribe(
+ (res: TaskDetailsModel[]) => {
+ res.forEach((task) => {
+ this.taskObserver.next(task);
+ });
+ },
+ (err) => {
+ console.log(err);
+ }
+ );
+ } else {
+ this.activeTasks = [];
+ }
+ }
+
+ public loadCompleted(processId: string) {
+ this.completedTasks = [];
+ if (processId) {
+ this.activitiProcess.getProcessTasks(processId, 'completed').subscribe(
+ (res: TaskDetailsModel[]) => {
+ res.forEach((task) => {
+ this.completedTaskObserver.next(task);
+ });
+ },
+ (err) => {
+ console.log(err);
+ }
+ );
+ } else {
+ this.completedTasks = [];
+ }
+ }
+
+ getUserFullName(user: any) {
+ if (user) {
+ return (user.firstName && user.firstName !== 'null'
+ ? user.firstName + ' ' : '') +
+ user.lastName;
+ }
+ return '';
+ }
+
+ public clickTask($event: any, task: TaskDetailsModel) {
+ this.selectedTaskId = task.id;
+ this.taskdetails.loadDetails(task.id);
+ this.showDialog();
+ }
+
+ public showDialog() {
+ if (this.dialog) {
+ this.dialog.nativeElement.showModal();
+ }
+ }
+
+ public cancelDialog() {
+ this.closeDialog();
+ }
+
+ private closeDialog() {
+ if (this.dialog) {
+ this.dialog.nativeElement.close();
+ }
+ }
+
+ public taskFormCompleted() {
+ this.closeDialog();
+ this.load(this.processId);
+ this.taskFormCompletedEmitter.emit(this.processId);
+ }
+
+ public onRefreshClicked() {
+ this.load(this.processId);
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
index beedb69313..81e5da9857 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
@@ -1,6 +1,12 @@
-
-
+ = new EventEmitter();
+
+ @Output()
+ onSuccess: EventEmitter = new EventEmitter();
+
+ @Output()
+ onError: EventEmitter = new EventEmitter();
constructor (private processService: ActivitiProcessService, private translate: AlfrescoTranslationService) {
if (translate !== null) {
@@ -51,27 +71,77 @@ export class ActivitiProcesslistComponent implements OnInit {
}
ngOnInit() {
- this.getProcesses();
+ this.data = new ObjectDataTableAdapter(
+ [],
+ this.schemaColumn
+ );
+ if (this.filter) {
+ this.load(this.filter);
+ }
}
- getProcesses() {
- this.processService.getProcesses()
+ load(filter: FilterModel) {
+ this.processService.getProcessInstances(filter)
.subscribe(
(processInstances) => {
- this.data = new ObjectDataTableAdapter(
- processInstances,
- [
- {type: 'text', key: 'id', title: 'Id', sortable: true},
- {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true},
- {type: 'text', key: 'started', title: 'Started', sortable: true},
- {type: 'text', key: 'startedBy.email', title: 'Started By', sortable: true}
- ]
- );
+ this.renderProcessInstances(processInstances);
+ this.onSuccess.emit(processInstances);
},
- error => this.errorMessage = error);
+ error => {
+ this.errorMessage = error;
+ this.onError.emit(error);
+ });
}
- onItemClick(processInstance: ProcessInstance, event: any) {
- console.log(processInstance, event);
+ reload() {
+ this.load(this.filter);
+ }
+
+ /**
+ * Render the process list
+ *
+ * @param processInstances
+ */
+ private renderProcessInstances(processInstances: any[]) {
+ processInstances = this.optimizeProcessNames(processInstances);
+ this.data = new ObjectDataTableAdapter(
+ processInstances,
+ this.schemaColumn
+ );
+ }
+
+ /**
+ * Check if the list is empty
+ * @returns {ObjectDataTableAdapter|boolean}
+ */
+ isListEmpty(): boolean {
+ return this.data === undefined ||
+ (this.data && this.data.getRows() && this.data.getRows().length === 0);
+ }
+
+ /**
+ * Emit the event rowClick passing the current task id when the row is clicked
+ * @param event
+ */
+ onRowClick(event: DataRowEvent) {
+ let item = event;
+ this.currentProcessInstanceId = item.value.getValue('id');
+ this.rowClick.emit(this.currentProcessInstanceId);
+ }
+
+ /**
+ * Optimize process name field
+ * @param tasks
+ * @returns {any[]}
+ */
+ private optimizeProcessNames(tasks: any[]) {
+ tasks = tasks.map(t => {
+ t.name = t.name || 'No name';
+ if (t.name.length > 50) {
+ t.name = t.name.substring(0, 50) + '...';
+ }
+ return t;
+ });
+ return tasks;
}
}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.css
new file mode 100644
index 0000000000..7e9e64291f
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.css
@@ -0,0 +1,11 @@
+:host {
+ width: 100%;
+}
+
+.activiti-label {
+ font-weight: bolder;
+}
+
+.material-icons:hover {
+ color: rgb(255, 152, 0);
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html
new file mode 100644
index 0000000000..e5ca33e2be
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html
@@ -0,0 +1,23 @@
+
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
new file mode 100644
index 0000000000..d51de06c9e
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
@@ -0,0 +1,101 @@
+/*!
+ * @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, Input, OnInit, ViewChild } from '@angular/core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
+import { ActivitiProcessService } from './../services/activiti-process.service';
+
+declare let componentHandler: any;
+declare let __moduleName: string;
+
+@Component({
+ selector: 'activiti-start-process',
+ moduleId: __moduleName,
+ templateUrl: './activiti-start-process.component.html',
+ styleUrls: ['./activiti-start-process.component.css'],
+ providers: [ActivitiProcessService],
+ pipes: [ AlfrescoPipeTranslate ]
+
+})
+export class ActivitiStartProcessButton implements OnInit {
+
+ @Input()
+ appId: string;
+
+ @ViewChild('dialog')
+ dialog: any;
+
+ processDefinitions: any[] = [];
+
+ name: string;
+ processDefinition: string;
+
+ /**
+ * Constructor
+ * @param auth
+ * @param translate
+ * @param activitiProcess
+ */
+ constructor(private auth: AlfrescoAuthenticationService,
+ private translate: AlfrescoTranslationService,
+ private activitiProcess: ActivitiProcessService) {
+
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
+ }
+ }
+
+ ngOnInit() {
+ this.load(this.appId);
+ }
+
+ public load(appId: string) {
+ this.activitiProcess.getProcessDefinitions(this.appId).subscribe(
+ (res: any[]) => {
+ this.processDefinitions = res;
+ },
+ (err) => {
+ console.log(err);
+ }
+ );
+ }
+
+ public showDialog() {
+ if (this.dialog) {
+ this.dialog.nativeElement.showModal();
+ }
+ }
+
+ public startProcess() {
+ if (this.processDefinition && this.name) {
+ this.activitiProcess.startProcess(this.processDefinition, this.name).subscribe(
+ (res: any) => {
+ this.cancel();
+ },
+ (err) => {
+ console.log(err);
+ }
+ );
+ }
+ }
+
+ public cancel() {
+ if (this.dialog) {
+ this.dialog.nativeElement.close();
+ }
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/i18n/en.json b/ng2-components/ng2-activiti-processlist/src/i18n/en.json
index 8706fab794..5c45ffab35 100644
--- a/ng2-components/ng2-activiti-processlist/src/i18n/en.json
+++ b/ng2-components/ng2-activiti-processlist/src/i18n/en.json
@@ -1,10 +1,54 @@
{
"PROCESSLIST": {
- "NONE": "No active processes were found",
- "SUMMARY": "Found {{total}} active process instances",
- "ERROR": "An error occurred while loading the processes: {{errorMessage}}",
+ "NONE": "No process instances were found",
+ "SUMMARY": "Found {{total}} process instances",
+ "ERROR": "An error occurred while loading the processes instances: {{errorMessage}}",
"COLUMN": {
"NAME": "Name"
}
+ },
+ "FILTERS": {
+ "MESSAGES": {
+ "NONE": "No process instance filter selected."
+ }
+ },
+ "DETAILS": {
+ "LABELS": {
+ "STARTED_BY": "Started by",
+ "STARTED": "Started",
+ "COMMENTS": "Comments",
+ "TASKS_ACTIVE": "Active Tasks",
+ "TASKS_COMPLETED": "Completed Tasks",
+ "TASK_SUBTITLE": "Assigned to {{user}}, created {{created}}"
+ },
+ "BUTTON": {
+ "CANCEL": "Cancel Process"
+ },
+ "MESSAGES": {
+ "NONE": "No process details found."
+ },
+ "TASKS": {
+ "NO_ACTIVE": "No tasks are currently active",
+ "NO_COMPLETED": "No tasks have been completed yet",
+ "TASK_DETAILS": "Task details",
+ "TASK_CLOSE": "Close"
+ },
+ "COMMENTS": {
+ "NONE": "No comments."
+ }
+ },
+ "START_PROCESS": {
+ "BUTTON": "Start Process",
+ "DIALOG": {
+ "TITLE": "Start Process",
+ "LABEL": {
+ "TYPE": "Type",
+ "NAME": "Name"
+ },
+ "ACTION": {
+ "START": "Start",
+ "CANCEL": "Cancel"
+ }
+ }
}
}
diff --git a/ng2-components/ng2-activiti-processlist/src/models/comment.model.ts b/ng2-components/ng2-activiti-processlist/src/models/comment.model.ts
new file mode 100644
index 0000000000..d275e7ca1e
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/models/comment.model.ts
@@ -0,0 +1,38 @@
+/*!
+ * @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.
+ */
+
+/**
+ *
+ * Comment submitted against a process
+ *
+ * @returns {Comment} .
+ */
+import { User } from './user.model';
+
+export class Comment {
+ id: number;
+ message: string;
+ created: string;
+ createdBy: User;
+
+ constructor(id: number, message: string, created: string, createdBy: User) {
+ this.id = id;
+ this.message = message;
+ this.created = created;
+ this.createdBy = createdBy;
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/models/filter.model.ts b/ng2-components/ng2-activiti-processlist/src/models/filter.model.ts
new file mode 100644
index 0000000000..2cd0c0eb42
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/models/filter.model.ts
@@ -0,0 +1,60 @@
+/*!
+ * @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 object represent the filter.
+ *
+ *
+ * @returns {FilterModel} .
+ */
+export class FilterModel {
+ id: number;
+ name: string;
+ recent: boolean = false;
+ icon: string;
+ filter: FilterParamsModel;
+ appId: number;
+
+ constructor(name: string, recent: boolean, icon: string, query: string, state: string, assignment: string, appDefinitionId?: string) {
+ this.name = name;
+ this.recent = recent;
+ this.icon = icon;
+ this.filter = new FilterParamsModel(query, state, assignment, appDefinitionId);
+ }
+}
+
+/**
+ *
+ * This object represent the parameters of a filter.
+ *
+ *
+ * @returns {FilterModel} .
+ */
+export class FilterParamsModel {
+ name: string;
+ sort: string;
+ state: string;
+ appDefinitionId: string;
+
+ constructor(query: string, sort: string, state: string, appDefinitionId?: string) {
+ this.name = query;
+ this.sort = sort;
+ this.state = state;
+ this.appDefinitionId = appDefinitionId;
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/models/task-details.model.ts b/ng2-components/ng2-activiti-processlist/src/models/task-details.model.ts
new file mode 100644
index 0000000000..5ab0361aaa
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/models/task-details.model.ts
@@ -0,0 +1,93 @@
+/*!
+ * @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 object represent the details of a task.
+ *
+ *
+ * @returns {TaskDetailsModel} .
+ */
+import { User } from './user.model';
+
+export class TaskDetailsModel {
+ id: string;
+ name: string;
+ assignee: User;
+ priority: number;
+ adhocTaskCanBeReassigned: number;
+ category: string;
+ created: string;
+ description: string;
+ dueDate: string;
+ duration: string;
+ endDate: string;
+ executionId: string;
+ formKey: string;
+ initiatorCanCompleteTask: boolean = false;
+ managerOfCandidateGroup: boolean = false;
+ memberOfCandidateGroup: boolean = false;
+ memberOfCandidateUsers: boolean = false;
+ involvedPeople: User [];
+ parentTaskId: string;
+ parentTaskName: string;
+ processDefinitionCategory: string;
+ processDefinitionDeploymentId: string;
+ processDefinitionDescription: string;
+ processDefinitionId: string;
+ processDefinitionKey: string;
+ processDefinitionName: string;
+ processDefinitionVersion: number = 0;
+ processInstanceId: string;
+ processInstanceName: string;
+ processInstanceStartUserId: string;
+ taskDefinitionKey: string;
+
+
+ constructor(obj: any) {
+ this.id = obj.id;
+ this.name = obj.name;
+ this.priority = obj.priority;
+ this.assignee = new User(obj.assignee.id, obj.assignee.email, obj.assignee.firstName, obj.assignee.lastName);
+ this.adhocTaskCanBeReassigned = obj.adhocTaskCanBeReassigned;
+ this.created = obj.created;
+ this.description = obj.description;
+ this.dueDate = obj.dueDate;
+ this.duration = obj.duration;
+ this.endDate = obj.endDate;
+ this.executionId = obj.executionId;
+ this.formKey = obj.formKey;
+ this.initiatorCanCompleteTask = obj.initiatorCanCompleteTask;
+ this.managerOfCandidateGroup = obj.managerOfCandidateGroup;
+ this.memberOfCandidateGroup = obj.memberOfCandidateGroup;
+ this.memberOfCandidateUsers = obj.memberOfCandidateUsers;
+ this.involvedPeople = obj.involvedPeople;
+ this.parentTaskId = obj.parentTaskId;
+ this.parentTaskName = obj.parentTaskName;
+ this.processDefinitionCategory = obj.processDefinitionCategory;
+ this.processDefinitionDeploymentId = obj.processDefinitionDeploymentId;
+ this.processDefinitionDescription = obj.processDefinitionDescription;
+ this.processDefinitionId = obj.processDefinitionId;
+ this.processDefinitionKey = obj.processDefinitionKey;
+ this.processDefinitionName = obj.processDefinitionName;
+ this.processDefinitionVersion = obj.processDefinitionVersion;
+ this.processInstanceId = obj.processInstanceId;
+ this.processInstanceName = obj.processInstanceName;
+ this.processInstanceStartUserId = obj.processInstanceStartUserId;
+ this.taskDefinitionKey = obj.taskDefinitionKey;
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/models/user.model.ts b/ng2-components/ng2-activiti-processlist/src/models/user.model.ts
new file mode 100644
index 0000000000..6d21ad4e0b
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/models/user.model.ts
@@ -0,0 +1,38 @@
+/*!
+ * @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 object represent the user.
+ *
+ *
+ * @returns {User} .
+ */
+
+export class User {
+ id: number;
+ email: string;
+ firstName: string;
+ lastName: string;
+
+ constructor(id: number, email: string, firstName: string, lastName: string) {
+ this.id = id;
+ this.email = email;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts
index ee876a298d..9f5926172e 100644
--- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts
+++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts
@@ -17,6 +17,9 @@
import {AlfrescoAuthenticationService} from 'ng2-alfresco-core';
import {ProcessInstance} from '../models/process-instance';
+import {FilterModel} from '../models/filter.model';
+import {User} from '../models/user.model';
+import {Comment} from '../models/comment.model';
import {Injectable} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import 'rxjs/add/operator/map';
@@ -28,6 +31,16 @@ export class ActivitiProcessService {
constructor(public authService: AlfrescoAuthenticationService) {
}
+ /**
+ * Retrive all the Deployed app
+ * @returns {Observable}
+ */
+ getDeployedApplications(name: string): Observable {
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.appsApi.getAppDefinitions())
+ .map((response: any) => response.data.find(p => p.name === name))
+ .do(data => console.log('Application: ' + JSON.stringify(data)));
+ }
+
getProcesses(): Observable {
let request = {'page': 0, 'sort': 'created-desc', 'state': 'all'};
@@ -36,6 +49,109 @@ export class ActivitiProcessService {
.catch(this.handleError);
}
+ getProcessInstances(filter: FilterModel): Observable {
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.processApi.getProcessInstances(filter))
+ .map(this.extractData)
+ .catch(this.handleError);
+ }
+
+ getProcessFilters(appId: string): Observable {
+ let filterOpts = appId ? {
+ appId: appId
+ } : {};
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.userFiltersApi.getUserProcessInstanceFilters(filterOpts))
+ .map(this.extractData)
+ .catch(this.handleError);
+ }
+
+ getProcess(id: string): Observable {
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.processApi.getProcessInstance(id))
+ .catch(this.handleError);
+ }
+
+ getProcessTasks(id: string, state: string): Observable {
+ let taskOpts = state ? {
+ processInstanceId: id,
+ state: state
+ } : {
+ processInstanceId: id
+ };
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.taskApi.listTasks(taskOpts))
+ .map(this.extractData)
+ .map(tasks => tasks.map((task: any) => {
+ task.created = new Date(task.created);
+ return task;
+ }))
+ .catch(this.handleError);
+ }
+
+ /**
+ * Retrive all the process instance's comments
+ * @param id - process instance ID
+ * @returns {}
+ */
+ getProcessInstanceComments(id: string): Observable {
+ return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.commentsApi.getProcessInstanceComments(id))
+ .map(res => res)
+ .map((response: any) => {
+ let comments: Comment[] = [];
+ response.data.forEach((comment) => {
+ let user = new User(
+ comment.createdBy.id, comment.createdBy.email, comment.createdBy.firstName, comment.createdBy.lastName);
+ comments.push(new Comment(comment.id, comment.message, comment.created, user));
+ });
+ return comments;
+ }).catch(this.handleError);
+ }
+
+ /**
+ * Add a comment to a process instance
+ * @param id - process instance Id
+ * @param message - content of the comment
+ * @returns {Comment}
+ */
+ addProcessInstanceComment(id: string, message: string): Observable {
+ return Observable.fromPromise(
+ this.authService.getAlfrescoApi().activiti.commentsApi.addProcessInstanceComment({message: message}, id)
+ )
+ .map(res => res)
+ .map((response: Comment) => {
+ return new Comment(response.id, response.message, response.created, response.createdBy);
+ }).catch(this.handleError);
+
+ }
+
+ getProcessDefinitions(appId: string) {
+ let opts = appId ? {
+ latest: true,
+ appId: appId
+ } : {
+ latest: true
+ };
+ return Observable.fromPromise(
+ this.authService.getAlfrescoApi().activiti.processApi.getProcessDefinitions(opts)
+ )
+ .map(this.extractData)
+ .catch(this.handleError);
+ }
+
+ startProcess(processDefinitionId: string, name: string) {
+ let startRequest: any = {};
+ startRequest.name = name;
+ startRequest.processDefinitionId = processDefinitionId;
+ return Observable.fromPromise(
+ this.authService.getAlfrescoApi().activiti.processApi.startNewProcessInstance(startRequest)
+ )
+ .catch(this.handleError);
+ }
+
+ cancelProcess(processInstanceId: string) {
+ return Observable.fromPromise(
+ this.authService.getAlfrescoApi().activiti.processApi.deleteProcessInstance(processInstanceId)
+ )
+ .catch(this.handleError);
+ }
+
private extractData(res: any) {
return res.data || {};
}
diff --git a/ng2-components/ng2-activiti-tasklist/demo/package.json b/ng2-components/ng2-activiti-tasklist/demo/package.json
index e80059f6b5..30ce73d70c 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/package.json
+++ b/ng2-components/ng2-activiti-tasklist/demo/package.json
@@ -37,8 +37,8 @@
"material-design-lite": "1.1.3",
"ng2-translate": "2.2.2",
"alfresco-js-api": "^0.3.0",
- "ng2-alfresco-datatable": "^0.1.12",
- "ng2-alfresco-core": "^0.1.36"
+ "ng2-alfresco-datatable": "^0.3.0",
+ "ng2-alfresco-core": "^0.3.0"
},
"devDependencies": {
"browser-sync": "2.10.0",
diff --git a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts
index 28fa067a7d..606b3d8bcf 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/src/main.ts
+++ b/ng2-components/ng2-activiti-tasklist/demo/src/main.ts
@@ -15,69 +15,70 @@
* limitations under the License.
*/
-import {Component, OnInit} from '@angular/core';
-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';
-import {HTTP_PROVIDERS} from '@angular/http';
-
-declare let AlfrescoApi: any;
+import { bootstrap } from '@angular/platform-browser-dynamic';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ALFRESCO_CORE_PROVIDERS, AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
+import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
+import { HTTP_PROVIDERS } from '@angular/http';
+import { ATIVITI_FORM_PROVIDERS } from 'ng2-activiti-form';
@Component({
selector: 'activiti-tasklist-demo',
- template: `label for="token">Insert a valid access token / ticket:
+ template: `
-
+
-
-
-
-
-
-
(observer => this.taskObserver = observer).share();
}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts
index 1ae99929c2..92bb57d444 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts
@@ -59,7 +59,7 @@ export class ActivitiComments implements OnInit {
private activitiTaskList: ActivitiTaskListService) {
if (translate) {
- translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
}
this.comment$ = new Observable(observer => this.commentObserver = observer).share();
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
index bc43a1adfd..9dff5f1289 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
@@ -70,7 +70,7 @@ export class ActivitiFilters implements OnInit {
this.filter$ = new Observable(observer => this.filterObserver = observer).share();
if (translate) {
- translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
}
}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
index c4e472b3b3..9509ff717d 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
@@ -52,7 +52,7 @@ export class ActivitiPeople implements OnInit {
private translate: AlfrescoTranslationService) {
if (translate) {
- translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
}
this.people$ = new Observable(observer => this.peopleObserver = observer).share();
}
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 4faceefe31..025043f400 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
@@ -92,7 +92,7 @@ export class ActivitiTaskDetails implements OnInit {
private activitiTaskList: ActivitiTaskListService) {
if (translate) {
- translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
}
}
@@ -125,6 +125,8 @@ export class ActivitiTaskDetails implements OnInit {
console.log(this.taskDetails);
}
);
+ } else {
+ this.taskDetails = null;
}
}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts
index a1f4d777ee..2c87a8845f 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts
@@ -49,7 +49,7 @@ export class ActivitiTaskHeader implements OnInit, OnChanges {
private translate: AlfrescoTranslationService) {
if (translate) {
- translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
}
}
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 3c9eafefc8..8684988f3a 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,11 +15,11 @@
* limitations under the License.
*/
-import {it, describe, inject, beforeEach, beforeEachProviders} from '@angular/core/testing';
-import {ActivitiTaskListService} from './activiti-tasklist.service';
-import {AlfrescoSettingsService, AlfrescoAuthenticationService} from 'ng2-alfresco-core';
-import {TaskDetailsModel} from '../models/task-details.model';
-import {Comment} from '../models/comment.model';
+import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
+import { ActivitiTaskListService } from './activiti-tasklist.service';
+import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { TaskDetailsModel } from '../models/task-details.model';
+import { Comment } from '../models/comment.model';
declare let AlfrescoApi: any;
declare let jasmine: any;
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 13b6aafb1c..e884ab47ca 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-core",
"description": "Alfresco Angular 2 Components core",
- "version": "0.2.0",
+ "version": "0.3.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"postinstall": "typings install",
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts
index aa2d876107..012e35c3a2 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts
@@ -33,9 +33,9 @@ export class AlfrescoSettingsService {
private providers: string = 'ALL'; // ECM, BPM , ALL
- bpmHostSubject: Subject = new Subject();
- ecmHostSubject: Subject = new Subject();
- providerSubject: Subject = new Subject();
+ public bpmHostSubject: Subject = new Subject();
+ public ecmHostSubject: Subject = new Subject();
+ public providerSubject: Subject = new Subject();
public get ecmHost(): string {
return this._ecmHost;
diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json
index 34516e71b7..56754f00d4 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/package.json
+++ b/ng2-components/ng2-alfresco-datatable/demo/package.json
@@ -41,8 +41,7 @@
"license-check": "1.1.5",
"material-design-icons": "2.2.3",
- "material-design-lite": "1.1.3",
- "ng2-activiti-processlist": "^0.1.0"
+ "material-design-lite": "1.1.3"
},
"devDependencies": {
"browser-sync": "2.10.0",
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index 38ed0864c1..a703b9b1b2 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-datatable",
"description": "Alfresco Angular2 DataTable Component",
- "version": "0.2.0",
+ "version": "0.3.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"postinstall": "typings install",
@@ -63,7 +63,7 @@
"rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12",
"ng2-translate": "2.2.2",
- "ng2-alfresco-core": "0.2.0"
+ "ng2-alfresco-core": "0.3.0"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
index 3c726bdd2c..537efb6226 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
@@ -47,7 +47,11 @@
[context-menu]="getContextMenuActions(row, col)">
-
`,
providers: [ACTIVITI_PROCESSLIST_PROVIDERS],
directives: [ACTIVITI_PROCESSLIST_DIRECTIVES]
diff --git a/ng2-components/ng2-activiti-processlist/index.ts b/ng2-components/ng2-activiti-processlist/index.ts
index b1f8081c26..34bd934992 100644
--- a/ng2-components/ng2-activiti-processlist/index.ts
+++ b/ng2-components/ng2-activiti-processlist/index.ts
@@ -15,17 +15,30 @@
* limitations under the License.
*/
-import { ActivitiProcesslistComponent } from './src/components/activiti-processlist.component';
+import { ActivitiProcessInstanceListComponent } from './src/components/activiti-processlist.component';
+import { ActivitiProcessFilters } from './src/components/activiti-filters.component';
+import { ActivitiProcessInstanceHeader } from './src/components/activiti-process-instance-header.component';
+import { ActivitiProcessInstanceTasks } from './src/components/activiti-process-instance-tasks.component';
+import { ActivitiComments } from './src/components/activiti-comments.component';
+import { ActivitiProcessInstanceDetails } from './src/components/activiti-process-instance-details.component';
+import { ActivitiStartProcessButton } from './src/components/activiti-start-process.component';
import { ActivitiProcessService } from './src/services/activiti-process.service';
// components
export * from './src/components/activiti-processlist.component';
+export * from './src/components/activiti-process-instance-details.component';
// services
export * from './src/services/activiti-process.service';
export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [
- ActivitiProcesslistComponent
+ ActivitiProcessInstanceListComponent,
+ ActivitiProcessFilters,
+ ActivitiProcessInstanceDetails,
+ ActivitiProcessInstanceHeader,
+ ActivitiProcessInstanceTasks,
+ ActivitiComments,
+ ActivitiStartProcessButton
];
export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
diff --git a/ng2-components/ng2-activiti-processlist/karma.conf.js b/ng2-components/ng2-activiti-processlist/karma.conf.js
index f9a39b76a0..1a3d76b9db 100644
--- a/ng2-components/ng2-activiti-processlist/karma.conf.js
+++ b/ng2-components/ng2-activiti-processlist/karma.conf.js
@@ -20,6 +20,9 @@ module.exports = function (config) {
{pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.js', included: false, served: true, watched: false},
{pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.html', included: false, served: true, watched: false},
{pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.css', included: false, served: true, watched: false},
+ {pattern: 'node_modules/ng2-activiti-tasklist/dist/**/*.js', included: false, served: true, watched: false},
+ {pattern: 'node_modules/ng2-activiti-tasklist/dist/**/*.html', included: false, served: true, watched: false},
+ {pattern: 'node_modules/ng2-activiti-tasklist/dist/**/*.css', included: false, served: true, watched: false},
{pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false},
{pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', included: true, watched: false},
diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json
index 27fe458691..f918590830 100644
--- a/ng2-components/ng2-activiti-processlist/package.json
+++ b/ng2-components/ng2-activiti-processlist/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-activiti-processlist",
"description": "Show active processes from the Activiti BPM suite",
- "version": "0.2.0",
+ "version": "0.3.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"postinstall": "typings install",
@@ -63,8 +63,9 @@
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12",
"ng2-translate": "2.2.2",
- "ng2-alfresco-core": "0.2.0",
- "ng2-alfresco-datatable": "0.2.0"
+ "ng2-alfresco-core": "0.3.0",
+ "ng2-alfresco-datatable": "0.3.0",
+ "ng2-activiti-tasklist": "0.3.0"
},
"devDependencies": {
"angular-cli": "1.0.0-beta.9",
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.css
new file mode 100644
index 0000000000..ff0f8dd865
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.css
@@ -0,0 +1,7 @@
+:host {
+ width: 100%;
+}
+
+.activiti-label {
+ font-weight: bolder;
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.html
new file mode 100644
index 0000000000..169719612e
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.html
@@ -0,0 +1,35 @@
+{{ 'DETAILS.LABELS.COMMENTS' |translate }}
+
+
+ Add a comment
+
+
+
+
+ {{ 'DETAILS.COMMENTS.NONE' | translate }}
+
+
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts
new file mode 100644
index 0000000000..95f1219c92
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts
@@ -0,0 +1,121 @@
+/*!
+ * @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, Input, OnInit, ViewChild } from '@angular/core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
+import { ActivitiProcessService } from './../services/activiti-process.service';
+import { Comment } from '../models/comment.model';
+import { Observer } from 'rxjs/Observer';
+import { Observable } from 'rxjs/Observable';
+
+declare let componentHandler: any;
+declare let __moduleName: string;
+
+@Component({
+ selector: 'activiti-comments',
+ moduleId: __moduleName,
+ templateUrl: './activiti-comments.component.html',
+ styleUrls: ['./activiti-comments.component.css'],
+ providers: [ActivitiProcessService],
+ pipes: [ AlfrescoPipeTranslate ]
+
+})
+export class ActivitiComments implements OnInit {
+
+ @Input()
+ processId: string;
+
+ @ViewChild('dialog')
+ dialog: any;
+
+ comments: Comment [] = [];
+
+ private commentObserver: Observer{{ 'DETAILS.MESSAGES.NONE'|translate }}
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
new file mode 100644
index 0000000000..0196992b82
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
@@ -0,0 +1,108 @@
+/*!
+ * @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, Input, ViewChild, Output, EventEmitter } from '@angular/core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
+import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component';
+import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component';
+import { ActivitiComments } from './activiti-comments.component';
+import { ProcessInstance } from '../models/process-instance';
+
+
+declare let componentHandler: any;
+declare let __moduleName: string;
+
+@Component({
+ selector: 'activiti-process-instance-details',
+ moduleId: __moduleName,
+ templateUrl: './activiti-process-instance-details.component.html',
+ styleUrls: ['./activiti-process-instance-details.component.css'],
+ providers: [ActivitiProcessService],
+ directives: [ActivitiProcessInstanceHeader, ActivitiComments, ActivitiProcessInstanceTasks],
+ pipes: [AlfrescoPipeTranslate]
+
+})
+export class ActivitiProcessInstanceDetails {
+
+ @Input()
+ processInstanceId: string;
+
+ @ViewChild('activitiprocessheader')
+ processInstanceHeader: ActivitiProcessInstanceHeader;
+
+ @ViewChild('activitiprocesstasks')
+ tasksList: ActivitiProcessInstanceTasks;
+
+ @ViewChild('activitiprocesscomments')
+ commentsList: ActivitiComments;
+
+ @Input()
+ showTitle: boolean = true;
+
+ @Input()
+ showRefreshButton: boolean = true;
+
+ @Output()
+ processCancelledEmitter = new EventEmitter();
+
+ @Output()
+ taskFormCompletedEmitter = new EventEmitter();
+
+ processInstanceDetails: ProcessInstance;
+
+ /**
+ * Constructor
+ * @param auth
+ * @param translate
+ * @param activitiProcess
+ */
+ constructor(private auth: AlfrescoAuthenticationService,
+ private translate: AlfrescoTranslationService,
+ private activitiProcess: ActivitiProcessService) {
+
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
+ }
+ }
+
+ load(processId: string) {
+ if (processId) {
+ this.activitiProcess.getProcess(processId).subscribe(
+ (res: ProcessInstance) => {
+ this.processInstanceDetails = res;
+ if (this.processInstanceDetails) {
+ if (this.commentsList) {
+ this.commentsList.load(this.processInstanceDetails.id);
+ }
+ if (this.tasksList) {
+ this.tasksList.load(this.processInstanceDetails.id);
+ }
+ }
+ }
+ );
+ }
+ }
+
+ processCancelled(data: any) {
+ this.processCancelledEmitter.emit(data);
+ }
+
+ taskFormCompleted(data: any) {
+ this.taskFormCompletedEmitter.emit(data);
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css
new file mode 100644
index 0000000000..20fbab0626
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css
@@ -0,0 +1,7 @@
+:host {
+ width: 100%;
+}
+
+.activiti-label {
+ font-weight: bolder;
+}
\ No newline at end of file
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html
new file mode 100644
index 0000000000..e48011f9bc
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html
@@ -0,0 +1,15 @@
+{{processInstanceDetails.name}}
+
+
+
+
+
+
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
new file mode 100644
index 0000000000..9771c3624e
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
@@ -0,0 +1,73 @@
+/*!
+ * @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, Input, Output, EventEmitter } from '@angular/core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
+import { ProcessInstance } from '../models/process-instance';
+import { ActivitiProcessService } from './../services/activiti-process.service';
+
+declare let componentHandler: any;
+declare let __moduleName: string;
+
+@Component({
+ selector: 'activiti-process-instance-header',
+ moduleId: __moduleName,
+ templateUrl: './activiti-process-instance-header.component.html',
+ styleUrls: ['./activiti-process-instance-header.component.css'],
+ pipes: [ AlfrescoPipeTranslate ]
+
+})
+export class ActivitiProcessInstanceHeader {
+
+ @Input()
+ processInstance: ProcessInstance;
+
+ @Output()
+ processCancelled = new EventEmitter();
+
+ /**
+ * Constructor
+ * @param auth
+ * @param translate
+ * @param activitiProcess
+ */
+ constructor(private auth: AlfrescoAuthenticationService,
+ private translate: AlfrescoTranslationService,
+ private activitiProcess: ActivitiProcessService) {
+
+ if (translate) {
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
+ }
+ }
+
+ getStartedByFullName() {
+ if (this.processInstance && this.processInstance.startedBy) {
+ return (this.processInstance.startedBy.firstName && this.processInstance.startedBy.firstName !== 'null'
+ ? this.processInstance.startedBy.firstName + ' ' : '') +
+ this.processInstance.startedBy.lastName;
+ }
+ return '';
+ }
+
+ getStartedDate() {
+ return this.processInstance ? new Date(this.processInstance.started) : null;
+ }
+
+ cancelProcess() {
+ this.processCancelled.emit(this.activitiProcess.cancelProcess(this.processInstance.id));
+ }
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css
new file mode 100644
index 0000000000..ca7a24db2c
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css
@@ -0,0 +1,19 @@
+:host {
+ width: 100%;
+}
+
+.activiti-label {
+ font-weight: bolder;
+}
+
+.material-icons:hover {
+ color: rgb(255, 152, 0);
+}
+
+.task-details-dialog {
+ width: 600px;
+}
+
+.process-tasks-refresh {
+ float: right;
+}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
new file mode 100644
index 0000000000..0e4e014aa9
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
@@ -0,0 +1,52 @@
+
+
+
+ {{ 'DETAILS.LABELS.STARTED_BY' | translate }}:
+ {{getStartedByFullName()}}
+
+
+ {{ 'DETAILS.LABELS.STARTED' | translate }}:
+ {{getStartedDate() | date:'medium'}}
+
+
+
+
+
+
+
+
+{{ 'DETAILS.LABELS.TASKS_ACTIVE'|translate }}
+
+
+
+ {{ 'DETAILS.TASKS.NO_ACTIVE' | translate }}
+
+
+{{ 'DETAILS.LABELS.TASKS_COMPLETED'|translate }}
+
+
+
+ {{ 'DETAILS.TASKS.NO_COMPLETED' | translate }}
+
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
new file mode 100644
index 0000000000..5b2cfae098
--- /dev/null
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
@@ -0,0 +1,182 @@
+/*!
+ * @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, Input, OnInit, ViewChild, Output, EventEmitter } from '@angular/core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
+import { ActivitiProcessService } from './../services/activiti-process.service';
+import { TaskDetailsModel } from '../models/task-details.model';
+import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
+import { Observer } from 'rxjs/Observer';
+import { Observable } from 'rxjs/Observable';
+
+declare let componentHandler: any;
+declare let __moduleName: string;
+
+@Component({
+ selector: 'activiti-process-instance-tasks',
+ moduleId: __moduleName,
+ templateUrl: './activiti-process-instance-tasks.component.html',
+ styleUrls: ['./activiti-process-instance-tasks.component.css'],
+ providers: [ActivitiProcessService],
+ directives: [ ALFRESCO_TASKLIST_DIRECTIVES ],
+ pipes: [ AlfrescoPipeTranslate ]
+
+})
+export class ActivitiProcessInstanceTasks implements OnInit {
+
+ @Input()
+ processId: string;
+
+ @Input()
+ showRefreshButton: boolean = true;
+
+ @Output()
+ taskFormCompletedEmitter = new EventEmitter();
+
+ activeTasks: TaskDetailsModel[] = [];
+ completedTasks: TaskDetailsModel[] = [];
+
+ private taskObserver: ObserverMy Activiti Processes
- -{{ 'PROCESSLIST.NONE' | translate }}
-{{ 'FILTERS.MESSAGES.NONE' | translate }}
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
deleted file mode 100644
index a6feba83bd..0000000000
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
+++ /dev/null
@@ -1,65 +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.
- */
-
-import {describe, expect, it, inject, beforeEachProviders, beforeEach} from '@angular/core/testing';
-import {TestComponentBuilder} from '@angular/compiler/testing';
-import {AlfrescoSettingsService, AlfrescoTranslationService, AlfrescoAuthenticationService} from 'ng2-alfresco-core';
-import {ActivitiProcesslistComponent} from '../../src/components/activiti-processlist.component';
-import {TranslationMock} from './../assets/translation.service.mock';
-import {ActivitiProcessService} from '../services/activiti-process.service';
-
-describe('ActivitiProcesslistComponent', () => {
-
- let processlistComponentFixture, element, component;
-
-
- beforeEachProviders(() => {
- return [
- ActivitiProcessService,
- AlfrescoSettingsService,
- AlfrescoAuthenticationService,
- {provide: AlfrescoTranslationService, useClass: TranslationMock}
- ];
- });
-
- beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
- return tcb
- .createAsync(ActivitiProcesslistComponent)
- .then(fixture => {
- processlistComponentFixture = fixture;
- element = processlistComponentFixture.nativeElement;
- component = processlistComponentFixture.componentInstance;
- });
- }));
-
- it('should have a valid title', () => {
- expect(element.querySelector('h1')).toBeDefined();
- expect(element.getElementsByTagName('h1')[0].innerHTML).toEqual('My Activiti Processes');
- });
-
- it('should contain a list of processes', () => {
- let componentHandler = jasmine.createSpyObj('componentHandler', [
- 'upgradeAllRegistered'
- ]);
- window['componentHandler'] = componentHandler;
-
- component.ngOnInit();
- processlistComponentFixture.detectChanges();
- expect(element.querySelector('table')).toBeDefined();
- expect(element.querySelectorAll('table tbody tr').length).toEqual(1);
- });
-});
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
index a63a7dac0b..6f22951373 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-import {Component, OnInit } from '@angular/core';
+import {Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { AlfrescoPipeTranslate, AlfrescoTranslationService, CONTEXT_MENU_DIRECTIVES, CONTEXT_MENU_PROVIDERS } from 'ng2-alfresco-core';
-import { ALFRESCO_DATATABLE_DIRECTIVES, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
+import { ALFRESCO_DATATABLE_DIRECTIVES, ObjectDataTableAdapter, DataRowEvent } from 'ng2-alfresco-datatable';
import { ActivitiProcessService } from '../services/activiti-process.service';
-import { ProcessInstance } from '../models/process-instance';
+import { FilterModel } from '../models/filter.model';
declare let __moduleName: string;
@Component({
moduleId: __moduleName,
- selector: 'activiti-processlist',
+ selector: 'activiti-process-instance-list',
styles: [
`
:host h1 {
@@ -36,13 +36,33 @@ declare let __moduleName: string;
templateUrl: './activiti-processlist.component.html',
directives: [ ALFRESCO_DATATABLE_DIRECTIVES, CONTEXT_MENU_DIRECTIVES ],
pipes: [ AlfrescoPipeTranslate ],
- providers: [ CONTEXT_MENU_PROVIDERS ]
+ providers: [ CONTEXT_MENU_PROVIDERS, ActivitiProcessService ]
})
-export class ActivitiProcesslistComponent implements OnInit {
+export class ActivitiProcessInstanceListComponent implements OnInit {
errorMessage: string;
- processInstances: ProcessInstance[];
data: ObjectDataTableAdapter;
+ currentProcessInstanceId: string;
+
+ @Input()
+ filter: FilterModel;
+
+ @Input()
+ schemaColumn: any[] = [
+ {type: 'text', key: 'id', title: 'Id', sortable: true},
+ {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true},
+ {type: 'text', key: 'started', title: 'Started', sortable: true},
+ {type: 'text', key: 'startedBy.email', title: 'Started By', sortable: true}
+ ];
+
+ @Output()
+ rowClick: EventEmitter
+
+
+
+
+ {{ 'PROCESSLIST.NONE' | translate }}
+
++ template: `
-
+
Authentication failed to ip {{ bpmHost }} with user: admin, admin, you can still try to add a valid token to perform
operations.
-
-
-
-
-
-
-
`,
styles: [
':host > .container {padding: 10px}',
'.p-10 { padding: 10px; }'
],
- directives: [ActivitiTaskList]
+ directives: [ALFRESCO_TASKLIST_DIRECTIVES]
})
class ActivitiTaskListDemo implements OnInit {
+ @ViewChild('activititasklist')
+ activititasklist: any;
+
+ @ViewChild('activitidetails')
+ activitidetails: any;
+
bpmHost: string = 'http://127.0.0.1:9999';
token: string;
- data: ObjectDataTableAdapter;
-
authenticated: boolean;
+ schemaColumn: any [] = [];
+
+ currentTaskId: string;
+
+ taskFilter: any;
+
constructor(private authService: AlfrescoAuthenticationService,
private settingsService: AlfrescoSettingsService) {
this.settingsService.setProviders('BPM');
- this.data = new ObjectDataTableAdapter([], []);
}
ngOnInit() {
this.login();
- 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}
+ this.schemaColumn = [
+ {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}
];
-
- let columns = schema.map(col => new ObjectDataColumn(col));
- this.data.setColumns(columns);
}
login() {
@@ -92,9 +93,20 @@ class ActivitiTaskListDemo implements OnInit {
this.authenticated = false;
});
}
+
+ onFilterClick(event: any) {
+ this.taskFilter = event;
+ this.activititasklist.load(this.taskFilter);
+ }
+
+ onRowClick(taskId) {
+ this.currentTaskId = taskId;
+ this.activitidetails.loadDetails(this.currentTaskId);
+ }
}
bootstrap(ActivitiTaskListDemo, [
HTTP_PROVIDERS,
+ ATIVITI_FORM_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
index 4a716d3e2a..6d8052d6c6 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-tasklist/demo/systemjs.config.js
@@ -13,6 +13,7 @@
'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-form': 'node_modules/ng2-activiti-form/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
@@ -24,6 +25,7 @@
'ng2-translate': { defaultExtension: 'js' },
'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js' },
+ 'ng2-activiti-form': { main: 'index.js', defaultExtension: 'js' },
'ng2-activiti-tasklist': { main: 'index.js', defaultExtension: 'js' }
};
var ngPackageNames = [
diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json
index 5b5a9e5d8a..93d860c6ab 100644
--- a/ng2-components/ng2-activiti-tasklist/package.json
+++ b/ng2-components/ng2-activiti-tasklist/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-activiti-tasklist",
"description": "Activiti Angular2 Task List Component",
- "version": "0.2.0",
+ "version": "0.3.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"postinstall": "typings install",
@@ -67,9 +67,9 @@
"rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12",
"ng2-translate": "2.2.2",
- "ng2-alfresco-core": "0.2.0",
- "ng2-alfresco-datatable": "0.2.0",
- "ng2-activiti-form": "0.2.0",
+ "ng2-alfresco-core": "0.3.0",
+ "ng2-alfresco-datatable": "0.3.0",
+ "ng2-activiti-form": "0.3.0",
"alfresco-js-api": "^0.3.0"
},
"peerDependencies": {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts
index e958e993a1..e2552ecaed 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts
@@ -59,7 +59,7 @@ export class ActivitiChecklist implements OnInit {
private activitiTaskList: ActivitiTaskListService) {
if (translate) {
- translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
+ translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src');
}
this.task$ = new Observable
{{asIconValue(row, col)}}
- }})
+
{{data.getValue(row, col)}}
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
index e605788a8f..7aafdf8e7e 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
@@ -320,4 +320,29 @@ describe('DataTable', () => {
expect(dataTable.isColumnSorted( {key: 'column_1'}, 'asc')).toBeTruthy();
expect(dataTable.isColumnSorted( {key: 'column_2'}, 'desc')).toBeFalsy();
});
+
+ it('should replace image source with fallback thumbnail on error', () => {
+ let event = {
+ srcElement: {
+ src: 'missing-image'
+ }
+ };
+
+ dataTable.fallbackThumbnail = '';
+ dataTable.onImageLoadingError(event);
+ expect(event.srcElement.src).toBe(dataTable.fallbackThumbnail);
+ });
+
+ it('should replace image source only when fallback available', () => {
+ const originalSrc = 'missing-image';
+ let event = {
+ srcElement: {
+ src: originalSrc
+ }
+ };
+
+ dataTable.fallbackThumbnail = null;
+ dataTable.onImageLoadingError(event);
+ expect(event.srcElement.src).toBe(originalSrc);
+ });
});
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
index f72b200561..f9387b8725 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
@@ -63,6 +63,9 @@ export class DataTableComponent implements OnInit, AfterViewChecked {
@Input()
actions: boolean = false;
+ @Input()
+ fallbackThumbnail: string;
+
@Output()
rowClick: EventEmitter = new EventEmitter();
@@ -155,6 +158,13 @@ export class DataTableComponent implements OnInit, AfterViewChecked {
}
}
+ onImageLoadingError(event: Event) {
+ if (event && this.fallbackThumbnail) {
+ let element = event.srcElement;
+ element.src = this.fallbackThumbnail;
+ }
+ }
+
isIconValue(row: DataRow, col: DataColumn) {
if (row && col) {
let value = row.getValue(col.key);
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/index.html b/ng2-components/ng2-alfresco-documentlist/demo/index.html
index 83e36b9f9c..f1c18c3ceb 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/index.html
+++ b/ng2-components/ng2-alfresco-documentlist/demo/index.html
@@ -12,6 +12,10 @@
+
+
+
+
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index f436990778..cd5cb5052b 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -36,10 +36,11 @@
"material-design-icons": "2.2.3",
"material-design-lite": "1.1.3",
"ng2-translate": "2.2.2",
+ "intl": "1.2.4",
"alfresco-js-api": "^0.3.0",
- "ng2-alfresco-core": "^0.2.0",
- "ng2-alfresco-documentlist": "^0.2.0",
- "ng2-alfresco-datatable": "^0.2.0"
+ "ng2-alfresco-core": "^0.3.0",
+ "ng2-alfresco-documentlist": "^0.3.0",
+ "ng2-alfresco-datatable": "^0.3.0"
},
"devDependencies": {
"concurrently": "2.0.0",
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
index 1cdf4bdd0d..712d72f2c4 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
@@ -37,101 +37,108 @@ import {
@Component({
selector: 'alfresco-documentlist-demo',
template: `
-
-
-
-
+
+
+
+
-
- ![]()
+
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts
index b4ed50bfa5..9dc72dc090 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts
@@ -492,35 +492,11 @@ describe('DocumentList', () => {
expect(documentList.displayFolderContent).not.toHaveBeenCalled();
});
- // TODO: move to data adapter
- /*
- it('should sort by dates up to ms', () => {
- let file1 = new FileNode();
- file1.entry['dateProp'] = new Date(2016, 6, 30, 13, 14, 1);
-
- let file2 = new FileNode();
- file2.entry['dateProp'] = new Date(2016, 6, 30, 13, 14, 2);
-
- let page = new PageNode([file1, file2]);
-
- // desc
- documentList.sort(page, new ColumnSortingModel({
- key: 'dateProp',
- direction: 'desc'
- }));
-
- expect(page.list.entries[0]).toBe(file2);
- expect(page.list.entries[1]).toBe(file1);
-
- // asc
- documentList.sort(page, new ColumnSortingModel({
- key: 'dateProp',
- direction: 'asc'
- }));
-
- expect(page.list.entries[0]).toBe(file1);
- expect(page.list.entries[1]).toBe(file2);
+ it('should enforce single-click on mobile browser', () => {
+ spyOn(documentList, 'isMobile').and.returnValue(true);
+ documentList.navigationMode = DocumentList.DOUBLE_CLICK_NAVIGATION;
+ documentList.ngOnInit();
+ expect(documentList.isMobile).toHaveBeenCalled();
+ expect(documentList.navigationMode).toBe(DocumentList.SINGLE_CLICK_NAVIGATION);
});
- */
-
});
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index 36e2f87ada..fa79a3d14d 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -77,7 +77,7 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
navigate: boolean = true;
@Input()
- navigationMode: string = 'dblclick'; // click|dblclick
+ navigationMode: string = DocumentList.DOUBLE_CLICK_NAVIGATION; // click|dblclick
@Input()
thumbnails: boolean = false;
@@ -184,6 +184,11 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
this.data.thumbnails = this.thumbnails;
this.data.maxItems = this.pageSize;
this.contextActionHandler.subscribe(val => this.contextActionCallback(val));
+
+ // Automatically enforce single-click navigation for mobile browsers
+ if (this.isMobile()) {
+ this.navigationMode = DocumentList.SINGLE_CLICK_NAVIGATION;
+ }
}
ngAfterContentInit() {
@@ -206,6 +211,10 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
if (componentHandler) {
componentHandler.upgradeAllRegistered();
}
+ }
+
+ isMobile(): boolean {
+ return !!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
}
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
index 42f9073d9f..3dd2c1a4fb 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
@@ -400,6 +400,34 @@ describe('ShareDataTableAdapter', () => {
expect(( rows[0]).node).toBe(file2);
expect(( rows[1]).node).toBe(file1);
});
+
+ it('should preserve sorting on navigation', () => {
+ let file1 = new FileNode('file1');
+ let file2 = new FileNode('file2');
+ let file3 = new FileNode('file3');
+ let file4 = new FileNode('file4');
+
+ let col = { key: 'name' };
+ let adapter = new ShareDataTableAdapter(documentListService, null, [col]);
+ adapter.setSorting(new DataSorting('name', 'asc'));
+
+ let page1 = new PageNode([file2, file1]);
+ let page2 = new PageNode([file4, file3]);
+
+ documentListService.getFolderResult = page1;
+ adapter.loadPath('/page1');
+
+ let sorted = adapter.getRows();
+ expect(( sorted[0]).node).toBe(file1);
+ expect(( sorted[1]).node).toBe(file2);
+
+ documentListService.getFolderResult = page2;
+ adapter.loadPath('/page2');
+
+ sorted = adapter.getRows();
+ expect(( sorted[0]).node).toBe(file3);
+ expect(( sorted[1]).node).toBe(file4);
+ });
});
describe('ShareDataRow', () => {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
index a3146ff66a..7df12aca26 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
@@ -181,32 +181,7 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid
setSorting(sorting: DataSorting): void {
this.sorting = sorting;
-
- if (sorting && sorting.key && this.rows && this.rows.length > 0) {
- this.rows.sort((a: ShareDataRow, b: ShareDataRow) => {
- if (a.node.entry.isFolder !== b.node.entry.isFolder) {
- return a.node.entry.isFolder ? -1 : 1;
- }
-
- let left = a.getValue(sorting.key);
- if (left) {
- left = (left instanceof Date) ? left.valueOf().toString() : left.toString();
- } else {
- left = '';
- }
-
- let right = b.getValue(sorting.key);
- if (right) {
- right = (right instanceof Date) ? right.valueOf().toString() : right.toString();
- } else {
- right = '';
- }
-
- return sorting.direction === 'asc'
- ? left.localeCompare(right)
- : right.localeCompare(left);
- });
- }
+ this.sortRows(this.rows, this.sorting);
}
sort(key?: string, direction?: string): void {
@@ -243,6 +218,34 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid
this.imageResolver = resolver;
}
+ private sortRows(rows: DataRow[], sorting: DataSorting) {
+ if (sorting && sorting.key && rows && rows.length > 0) {
+ rows.sort((a: ShareDataRow, b: ShareDataRow) => {
+ if (a.node.entry.isFolder !== b.node.entry.isFolder) {
+ return a.node.entry.isFolder ? -1 : 1;
+ }
+
+ let left = a.getValue(sorting.key);
+ if (left) {
+ left = (left instanceof Date) ? left.valueOf().toString() : left.toString();
+ } else {
+ left = '';
+ }
+
+ let right = b.getValue(sorting.key);
+ if (right) {
+ right = (right instanceof Date) ? right.valueOf().toString() : right.toString();
+ } else {
+ right = '';
+ }
+
+ return sorting.direction === 'asc'
+ ? left.localeCompare(right)
+ : right.localeCompare(left);
+ });
+ }
+ }
+
private loadPage(page: NodePaging) {
this.page = page;
this.resetPagination();
@@ -260,11 +263,16 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid
// Sort by first sortable or just first column
if (this.columns && this.columns.length > 0) {
- let sortable = this.columns.filter(c => c.sortable);
- if (sortable.length > 0) {
- this.sort(sortable[0].key, 'asc');
+ let sorting = this.getSorting();
+ if (sorting) {
+ this.sortRows(rows, sorting);
} else {
- this.sort(this.columns[0].key, 'asc');
+ let sortable = this.columns.filter(c => c.sortable);
+ if (sortable.length > 0) {
+ this.sort(sortable[0].key, 'asc');
+ } else {
+ this.sort(this.columns[0].key, 'asc');
+ }
}
}
}
diff --git a/ng2-components/ng2-alfresco-documentlist/src/img/document-list.empty-folder.png b/ng2-components/ng2-alfresco-documentlist/src/img/document-list.empty-folder.png
deleted file mode 100644
index 7a23727b20..0000000000
Binary files a/ng2-components/ng2-alfresco-documentlist/src/img/document-list.empty-folder.png and /dev/null differ
diff --git a/ng2-components/ng2-alfresco-documentlist/src/img/empty_doc_lib.svg b/ng2-components/ng2-alfresco-documentlist/src/img/empty_doc_lib.svg
new file mode 100644
index 0000000000..866acd527b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-documentlist/src/img/empty_doc_lib.svg
@@ -0,0 +1,208 @@
+
+
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 52977b3140..9d3ffaf878 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -67,7 +67,7 @@
"ng2-translate": "2.2.2",
"alfresco-js-api": "^0.3.0",
- "ng2-alfresco-core": "^0.1.36",
+ "ng2-alfresco-core": "^0.3.0",
"ng2-alfresco-login": "file:../"
},
"devDependencies": {
diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts
index 318d25a2f3..078fe1842d 100644
--- a/ng2-components/ng2-alfresco-login/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts
@@ -29,8 +29,8 @@ import {
@Component({
selector: 'my-app',
template: `
-
-
+
+
-
-
-
+
+
+
+
- Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid token to perform
+ Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform
operations.
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`,
styles: [':host > .container {padding: 10px}'],
directives: [DOCUMENT_LIST_DIRECTIVES, CONTEXT_MENU_DIRECTIVES],
@@ -141,28 +148,27 @@ import {
class DocumentListDemo implements OnInit {
currentPath: string = '/';
- authenticated: boolean;
-
+ authenticated: boolean = false;
ecmHost: string = 'http://devproducts-platform.alfresco.me';
- token: string;
+ ticket: string;
- constructor(
- private authService: AlfrescoAuthenticationService,
- private settingsService: AlfrescoSettingsService,
- translation: AlfrescoTranslationService,
- private documentActions: DocumentActionsService) {
+ constructor(private authService: AlfrescoAuthenticationService, private settingsService: AlfrescoSettingsService,
+ translation: AlfrescoTranslationService, private documentActions: DocumentActionsService) {
settingsService.ecmHost = this.ecmHost;
- if (this.authService.getTicket()) {
- this.token = this.authService.getTicket();
+ settingsService.setProviders('ECM');
+
+ if (this.authService.getTicketEcm()) {
+ this.ticket = this.authService.getTicketEcm();
}
+
translation.addTranslationFolder();
documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this));
}
- public updateToken(): void {
- localStorage.setItem('token', this.token);
+ public updateTicket(): void {
+ localStorage.setItem('ticket-ECM', this.ticket);
}
public updateHost(): void {
@@ -190,9 +196,9 @@ class DocumentListDemo implements OnInit {
login() {
this.authService.login('admin', 'admin').subscribe(
- token => {
- console.log(token);
- this.token = token;
+ ticket => {
+ console.log(ticket);
+ this.ticket = this.authService.getTicketEcm();
this.authenticated = true;
},
error => {
diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js
index 2edcd2e495..5bdd3f81bc 100644
--- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js
+++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js
@@ -72,7 +72,7 @@ module.exports = function (config) {
],
// Coverage reporter generates the coverage
- reporters: ['mocha', 'coverage', 'coveralls', 'kjhtml'],
+ reporters: ['mocha', 'coverage', 'kjhtml'],
// Source files that you wanna generate coverage for.
// Do not include tests or libraries (these files will be instrumented by Istanbul)
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index d1b88a967f..12a7b232ee 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-documentlist",
"description": "Alfresco Angular2 Document List Component",
- "version": "0.2.0",
+ "version": "0.3.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"postinstall": "typings install",
@@ -70,8 +70,8 @@
"rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12",
"ng2-translate": "2.2.2",
- "ng2-alfresco-core": "0.2.0",
- "ng2-alfresco-datatable": "0.2.0",
+ "ng2-alfresco-core": "0.3.0",
+ "ng2-alfresco-datatable": "0.3.0",
"alfresco-js-api": "^0.3.0"
},
"peerDependencies": {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.css b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.css
index e69de29bb2..91b6e02eb4 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.css
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.css
@@ -0,0 +1,44 @@
+.document-list_empty_template {
+ text-align: center;
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+.document-list__this-space-is-empty {
+ height: 32px;
+ opacity: 0.26;
+ font-family: Muli, Helvetica, Arial, sans-serif;
+ font-size: 24px;
+ line-height: 1.33;
+ letter-spacing: -1px;
+ color: #000000;
+}
+
+.document-list__drag-drop {
+ height: 56px;
+ opacity: 0.54;
+ font-family: Muli, Helvetica, Arial, sans-serif;
+ font-size: 56px;
+ line-height: 1;
+ letter-spacing: -2px;
+ color: #000000;
+ margin-top: 40px;
+}
+
+.document-list__any-files-here-to-add {
+ height: 24px;
+ opacity: 0.54;
+ font-family: Muli, Helvetica, Arial, sans-serif;
+ font-size: 16px;
+ line-height: 1.5;
+ letter-spacing: -0.4px;
+ color: #000000;
+ margin-top: 17px;
+}
+
+.document-list__empty_doc_lib {
+ width: 565px;
+ height: 161px;
+ object-fit: contain;
+ margin-top: 17px;
+}
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
index 5964792515..06f06bd90c 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
@@ -2,6 +2,7 @@
[data]="data"
[actions]="contentActions"
[multiselect]="multiselect"
+ [fallbackThumbnail]="baseComponentPath + '/img/ft_ic_miscellaneous.svg'"
(showRowContextMenu)="onShowRowContextMenu($event)"
(showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)"
@@ -9,7 +10,12 @@
(rowDblClick)="onRowDblClick($event)">
+ ![]()
+
This folder is empty
+ Drag and Drop
+ any files here to add
+ -
+
+