mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
Separate Start Process UI from dialog
- Add Start Process section in demo shell - Remove old component in filters component Refs #1048
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
<a id="apps-header" href="#apps" class="mdl-layout__tab is-active">APPS</a>
|
||||
<a id="tasks-header" href="#tasks" class="mdl-layout__tab">TASK LIST</a>
|
||||
<a id="processes-header" href="#processes" class="mdl-layout__tab">PROCESS LIST</a>
|
||||
<a id="start-process-header" href="#start-process" class="mdl-layout__tab">START PROCESS</a>
|
||||
<a id="report-header" href="#report" class="mdl-layout__tab">ANALYTICS</a>
|
||||
</div>
|
||||
</header>
|
||||
@@ -64,7 +65,6 @@
|
||||
<div class="mdl-grid">
|
||||
<div class="mdl-cell mdl-cell--2-col task-column">
|
||||
<span>Process Filters</span>
|
||||
<activiti-start-process-instance [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process-instance>
|
||||
<activiti-process-instance-filters [appId]="appId"
|
||||
(filterClick)="onProcessFilterClick($event)" (onSuccess)="onSuccessProcessFilterList($event)"
|
||||
#activitiprocessfilter></activiti-process-instance-filters>
|
||||
@@ -90,6 +90,21 @@
|
||||
</section>
|
||||
|
||||
|
||||
<!-- START PROCESS COMPONENT -->
|
||||
<section class="mdl-layout__tab-panel" id="start-process">
|
||||
<div class="page-content">
|
||||
<div class="page-content">
|
||||
<div class="mdl-grid">
|
||||
<div class="mdl-cell mdl-cell--12-col task-column">
|
||||
<span>Start Process</span>
|
||||
<activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<!-- ANALYTICS COMPONENT -->
|
||||
|
||||
<section class="mdl-layout__tab-panel" id="report">
|
||||
|
@@ -22,7 +22,7 @@ import {
|
||||
ActivitiApps,
|
||||
ActivitiTaskList
|
||||
} from 'ng2-activiti-tasklist';
|
||||
import { ActivitiProcessInstanceListComponent } from 'ng2-activiti-processlist';
|
||||
import { ActivitiProcessInstanceListComponent, ActivitiStartProcessInstance } from 'ng2-activiti-processlist';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { Subscription } from 'rxjs/Rx';
|
||||
import {
|
||||
@@ -65,6 +65,9 @@ export class ActivitiDemoComponent implements AfterViewChecked {
|
||||
@ViewChild('activitiprocessdetails')
|
||||
activitiprocessdetails: any;
|
||||
|
||||
@ViewChild(ActivitiStartProcessInstance)
|
||||
activitiStartProcess: ActivitiStartProcessInstance;
|
||||
|
||||
@ViewChild('tabmain')
|
||||
tabMain: any;
|
||||
|
||||
@@ -186,7 +189,9 @@ export class ActivitiDemoComponent implements AfterViewChecked {
|
||||
}
|
||||
|
||||
onStartProcessInstance() {
|
||||
this.activitiStartProcess.reset();
|
||||
this.activitiprocesslist.reload();
|
||||
this.changeTab('start-process', 'processes');
|
||||
}
|
||||
|
||||
processCancelled(data: any) {
|
||||
|
@@ -27,12 +27,15 @@ import { ActivitiProcessInstanceHeader } from './src/components/activiti-process
|
||||
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 { ActivitiStartProcessInstance } from './src/components/activiti-start-process.component';
|
||||
import { ActivitiStartProcessInstanceDialog } from './src/components/activiti-start-process-dialog.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';
|
||||
export * from './src/components/activiti-start-process.component';
|
||||
export * from './src/components/activiti-start-process-dialog.component';
|
||||
|
||||
// models
|
||||
export * from './src/models/index';
|
||||
@@ -47,7 +50,8 @@ export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [
|
||||
ActivitiProcessInstanceHeader,
|
||||
ActivitiProcessInstanceTasks,
|
||||
ActivitiComments,
|
||||
ActivitiStartProcessButton
|
||||
ActivitiStartProcessInstance,
|
||||
ActivitiStartProcessInstanceDialog
|
||||
];
|
||||
|
||||
export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
|
||||
|
@@ -0,0 +1,12 @@
|
||||
:host {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mdl-dialog {
|
||||
width: 400px;
|
||||
width: -moz-fit-content;
|
||||
width: -webkit-fit-content;
|
||||
width: -ms-fit-content;
|
||||
width: -o-fit-content;
|
||||
width: fit-content;
|
||||
}
|
@@ -0,0 +1,12 @@
|
||||
<button type="button" (click)="showDialog()" class="mdl-button" data-automation-id="btn-show" *ngIf="showButton">{{'START_PROCESS.BUTTON'|translate}}</button>
|
||||
|
||||
<dialog class="mdl-dialog" #dialog>
|
||||
<h4 class="mdl-dialog__title">{{'START_PROCESS.DIALOG.TITLE'|translate}}</h4>
|
||||
<div class="mdl-dialog__content">
|
||||
<activiti-start-process [appId]="appId" [showStartButton]="false" (start)="onStartProcessInstance($event)"></activiti-start-process>
|
||||
</div>
|
||||
<div class="mdl-dialog__actions">
|
||||
<button type="button" [disabled]="!validateForm()" (click)="startProcess()" class="mdl-button" data-automation-id="btn-start">{{'START_PROCESS.DIALOG.ACTION.START'|translate}}</button>
|
||||
<button type="button" (click)="closeDialog()" class="mdl-button close" data-automation-id="btn-close">{{'START_PROCESS.DIALOG.ACTION.CANCEL'|translate}}</button>
|
||||
</div>
|
||||
</dialog>
|
@@ -0,0 +1,171 @@
|
||||
/*!
|
||||
* @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 { ComponentFixture, TestBed, async } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { DebugElement } from '@angular/core';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
|
||||
import { ActivitiFormModule, FormService } from 'ng2-activiti-form';
|
||||
|
||||
import { TranslationMock } from './../assets/translation.service.mock';
|
||||
import { newProcess, fakeProcessDefs, taskFormMock } from './../assets/activiti-start-process.component.mock';
|
||||
import { ActivitiStartProcessInstance } from './activiti-start-process.component';
|
||||
import { ActivitiStartProcessInstanceDialog } from './activiti-start-process-dialog.component';
|
||||
import { ActivitiProcessService } from '../services/activiti-process.service';
|
||||
|
||||
describe('ActivitiStartProcessInstanceDialog', () => {
|
||||
|
||||
let componentHandler: any;
|
||||
let component: ActivitiStartProcessInstanceDialog;
|
||||
let fixture: ComponentFixture<ActivitiStartProcessInstanceDialog>;
|
||||
let processService: ActivitiProcessService;
|
||||
let formService: FormService;
|
||||
let getDefinitionsSpy: jasmine.Spy;
|
||||
let getStartFormDefinitionSpy: jasmine.Spy;
|
||||
let startProcessSpy: jasmine.Spy;
|
||||
let debugElement: DebugElement;
|
||||
|
||||
const showBtnSelector = '[data-automation-id="btn-show"]';
|
||||
const startBtnSelector = '[data-automation-id="btn-start"]';
|
||||
const closeBtnSelector = '[data-automation-id="btn-close"]';
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [ CoreModule, ActivitiFormModule ],
|
||||
declarations: [
|
||||
ActivitiStartProcessInstance,
|
||||
ActivitiStartProcessInstanceDialog
|
||||
],
|
||||
providers: [
|
||||
{ provide: AlfrescoTranslationService, useClass: TranslationMock },
|
||||
ActivitiProcessService
|
||||
]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
fixture = TestBed.createComponent(ActivitiStartProcessInstanceDialog);
|
||||
component = fixture.componentInstance;
|
||||
debugElement = fixture.debugElement;
|
||||
processService = fixture.debugElement.injector.get(ActivitiProcessService);
|
||||
formService = fixture.debugElement.injector.get(FormService);
|
||||
|
||||
getDefinitionsSpy = spyOn(processService, 'getProcessDefinitions').and.returnValue(Observable.of(fakeProcessDefs));
|
||||
startProcessSpy = spyOn(processService, 'startProcess').and.returnValue(Observable.of(newProcess));
|
||||
getStartFormDefinitionSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(Observable.of(taskFormMock));
|
||||
|
||||
componentHandler = jasmine.createSpyObj('componentHandler', [
|
||||
'upgradeAllRegistered',
|
||||
'upgradeElement'
|
||||
]);
|
||||
window['componentHandler'] = componentHandler;
|
||||
});
|
||||
|
||||
describe('render dialog', () => {
|
||||
|
||||
let buttonEl: DebugElement;
|
||||
|
||||
it('should render a Start Process button by default', () => {
|
||||
fixture.detectChanges();
|
||||
buttonEl = debugElement.query(By.css(showBtnSelector));
|
||||
expect(buttonEl).not.toBeNull();
|
||||
});
|
||||
|
||||
it('should not render the Start Process button when configured not to', () => {
|
||||
component.showButton = false;
|
||||
fixture.detectChanges();
|
||||
buttonEl = debugElement.query(By.css(showBtnSelector));
|
||||
expect(buttonEl).toBeNull();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('open dialog', () => {
|
||||
|
||||
it('should open dialog when button clicked', () => {
|
||||
fixture.detectChanges();
|
||||
let showModalSpy = spyOn(component.dialog.nativeElement, 'showModal');
|
||||
let showButton: DebugElement = debugElement.query(By.css(showBtnSelector));
|
||||
showButton.triggerEventHandler('click', null);
|
||||
expect(showModalSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('start process', () => {
|
||||
|
||||
it('should output start event when process started from inside inner component', () => {
|
||||
let emitSpy = spyOn(component.start, 'emit');
|
||||
component.startProcessComponent.start.emit(newProcess);
|
||||
expect(emitSpy).toHaveBeenCalledWith(newProcess);
|
||||
});
|
||||
|
||||
it('should call inner component to start process when dialog Start button clicked', () => {
|
||||
let startSpy = spyOn(component.startProcessComponent, 'startProcess').and.returnValue(null);
|
||||
let closeButton: DebugElement = debugElement.query(By.css(startBtnSelector));
|
||||
closeButton.triggerEventHandler('click', null);
|
||||
expect(startSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('close dialog', () => {
|
||||
|
||||
let dialogPolyfill: any;
|
||||
|
||||
let setupDialog = () => {
|
||||
component.showDialog();
|
||||
fixture.detectChanges();
|
||||
};
|
||||
|
||||
let clickCancelButton = () => {
|
||||
let closeButton: DebugElement = debugElement.query(By.css(closeBtnSelector));
|
||||
closeButton.triggerEventHandler('click', null);
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
dialogPolyfill = { registerDialog: (widget) => widget.showModal = () => {} };
|
||||
dialogPolyfill.registerDialog = spyOn(dialogPolyfill, 'registerDialog').and.callThrough();
|
||||
window['dialogPolyfill'] = dialogPolyfill;
|
||||
});
|
||||
|
||||
it('should close dialog when close button clicked', async(() => {
|
||||
let closeSpy = spyOn(component.dialog.nativeElement, 'close');
|
||||
setupDialog();
|
||||
clickCancelButton();
|
||||
expect(closeSpy).toHaveBeenCalled();
|
||||
}));
|
||||
|
||||
it('should reset embedded component when dialog cancelled', async(() => {
|
||||
let resetSpy = spyOn(component.startProcessComponent, 'reset');
|
||||
setupDialog();
|
||||
clickCancelButton();
|
||||
expect(resetSpy).toHaveBeenCalled();
|
||||
}));
|
||||
|
||||
it('should register dialog via polyfill', () => {
|
||||
fixture.detectChanges();
|
||||
component.dialog.nativeElement.showModal = null;
|
||||
component.showDialog();
|
||||
expect(dialogPolyfill.registerDialog).toHaveBeenCalledWith(component.dialog.nativeElement);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
@@ -0,0 +1,78 @@
|
||||
/*!
|
||||
* @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, EventEmitter, Input, Output, ViewChild, DebugElement } from '@angular/core';
|
||||
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
|
||||
import { ActivitiStartProcessInstance } from './activiti-start-process.component';
|
||||
import { ProcessInstance } from './../models/process-instance.model';
|
||||
|
||||
declare let componentHandler: any;
|
||||
declare let dialogPolyfill: any;
|
||||
|
||||
@Component({
|
||||
selector: 'activiti-start-process-dialog',
|
||||
moduleId: module.id,
|
||||
templateUrl: './activiti-start-process-dialog.component.html',
|
||||
styleUrls: ['./activiti-start-process-dialog.component.css']
|
||||
})
|
||||
export class ActivitiStartProcessInstanceDialog {
|
||||
|
||||
@Input()
|
||||
appId: string;
|
||||
|
||||
@Input()
|
||||
showButton: boolean = true;
|
||||
|
||||
@Output()
|
||||
start: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
|
||||
|
||||
@ViewChild('dialog')
|
||||
dialog: DebugElement;
|
||||
|
||||
@ViewChild(ActivitiStartProcessInstance)
|
||||
startProcessComponent: ActivitiStartProcessInstance;
|
||||
|
||||
constructor(private translate: AlfrescoTranslationService) {
|
||||
if (translate) {
|
||||
translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
|
||||
}
|
||||
}
|
||||
|
||||
public showDialog() {
|
||||
if (!this.dialog.nativeElement.showModal) {
|
||||
dialogPolyfill.registerDialog(this.dialog.nativeElement);
|
||||
}
|
||||
this.dialog.nativeElement.showModal();
|
||||
}
|
||||
|
||||
validateForm() {
|
||||
return this.startProcessComponent.validateForm();
|
||||
}
|
||||
|
||||
public startProcess() {
|
||||
this.startProcessComponent.startProcess();
|
||||
}
|
||||
|
||||
public closeDialog() {
|
||||
this.startProcessComponent.reset();
|
||||
this.dialog.nativeElement.close();
|
||||
}
|
||||
|
||||
onStartProcessInstance(processInstance: ProcessInstance) {
|
||||
this.start.emit(processInstance);
|
||||
}
|
||||
}
|
@@ -10,10 +10,6 @@
|
||||
color: rgb(255, 152, 0);
|
||||
}
|
||||
|
||||
.mdl-dialog {
|
||||
width: 400px;
|
||||
}
|
||||
|
||||
.mdl-textfield.alf-mdl-selectfield label {
|
||||
color: rgba(0,0,0,.54);
|
||||
font-size: 12px;
|
||||
@@ -26,9 +22,10 @@
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.mdl-card .mdl-dialog__content {
|
||||
.mdl-card .mdl-card__supporting-text {
|
||||
width: 100%;
|
||||
padding: 20px;
|
||||
box-sizing: inherit;
|
||||
}
|
||||
|
||||
.mdl-dialog {
|
||||
|
@@ -1,8 +1,5 @@
|
||||
<button type="button" (click)="showDialog()" class="mdl-button">{{'START_PROCESS.BUTTON'|translate}}</button>
|
||||
|
||||
<dialog class="mdl-dialog" #dialog>
|
||||
<h4 class="mdl-dialog__title">{{'START_PROCESS.DIALOG.TITLE'|translate}}</h4>
|
||||
<div class="mdl-dialog__content">
|
||||
<div class="mdl-card mdl-shadow--2dp">
|
||||
<div class="mdl-card__supporting-text">
|
||||
<div class="mdl-card mdl-shadow--2dp error-message" *ngIf="errorMessageId">
|
||||
<div class="mdl-card__supporting-text">{{errorMessageId|translate}}</div>
|
||||
</div>
|
||||
@@ -24,12 +21,10 @@
|
||||
(formSaved)='onFormSaved($event)'
|
||||
(formCompleted)='onFormCompleted($event)'
|
||||
(formLoaded)='onFormLoaded($event)'
|
||||
(onError)='onFormError($event)'
|
||||
#startForm>
|
||||
(onError)='onFormError($event)'>
|
||||
</activiti-start-form>
|
||||
</div>
|
||||
<div class="mdl-dialog__actions">
|
||||
<div class="mdl-card__actions mdl-card--border" *ngIf="showStartButton">
|
||||
<button type="button" [disabled]="!validateForm()" (click)="startProcess()" class="mdl-button" data-automation-id="btn-start">{{'START_PROCESS.DIALOG.ACTION.START'|translate}}</button>
|
||||
<button type="button" (click)="cancel()" class="mdl-button close" data-automation-id="btn-close">{{'START_PROCESS.DIALOG.ACTION.CANCEL'|translate}}</button>
|
||||
</div>
|
||||
</dialog>
|
||||
</div>
|
||||
|
@@ -24,14 +24,14 @@ import { ActivitiFormModule, FormService } from 'ng2-activiti-form';
|
||||
|
||||
import { TranslationMock } from './../assets/translation.service.mock';
|
||||
import { newProcess, fakeProcessDefs, fakeProcessDefWithForm, taskFormMock } from './../assets/activiti-start-process.component.mock';
|
||||
import { ActivitiStartProcessButton } from './activiti-start-process.component';
|
||||
import { ActivitiStartProcessInstance } from './activiti-start-process.component';
|
||||
import { ActivitiProcessService } from '../services/activiti-process.service';
|
||||
|
||||
describe('ActivitiStartProcessButton', () => {
|
||||
describe('ActivitiStartProcessInstance', () => {
|
||||
|
||||
let componentHandler: any;
|
||||
let component: ActivitiStartProcessButton;
|
||||
let fixture: ComponentFixture<ActivitiStartProcessButton>;
|
||||
let component: ActivitiStartProcessInstance;
|
||||
let fixture: ComponentFixture<ActivitiStartProcessInstance>;
|
||||
let processService: ActivitiProcessService;
|
||||
let formService: FormService;
|
||||
let getDefinitionsSpy: jasmine.Spy;
|
||||
@@ -43,7 +43,7 @@ describe('ActivitiStartProcessButton', () => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [ CoreModule, ActivitiFormModule ],
|
||||
declarations: [
|
||||
ActivitiStartProcessButton
|
||||
ActivitiStartProcessInstance
|
||||
],
|
||||
providers: [
|
||||
{ provide: AlfrescoTranslationService, useClass: TranslationMock },
|
||||
@@ -55,7 +55,7 @@ describe('ActivitiStartProcessButton', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
fixture = TestBed.createComponent(ActivitiStartProcessButton);
|
||||
fixture = TestBed.createComponent(ActivitiStartProcessInstance);
|
||||
component = fixture.componentInstance;
|
||||
debugElement = fixture.debugElement;
|
||||
processService = fixture.debugElement.injector.get(ActivitiProcessService);
|
||||
@@ -148,7 +148,6 @@ describe('ActivitiStartProcessButton', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
component.name = 'My new process';
|
||||
component.showDialog();
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
@@ -218,7 +217,6 @@ describe('ActivitiStartProcessButton', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
component.name = 'My new process';
|
||||
component.showDialog();
|
||||
fixture.detectChanges();
|
||||
component.onProcessDefChange('my:process1');
|
||||
fixture.whenStable();
|
||||
@@ -248,7 +246,6 @@ describe('ActivitiStartProcessButton', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
getDefinitionsSpy.and.returnValue(Observable.of(fakeProcessDefWithForm));
|
||||
component.showDialog();
|
||||
fixture.detectChanges();
|
||||
component.onProcessDefChange('my:process1');
|
||||
fixture.detectChanges();
|
||||
@@ -275,67 +272,4 @@ describe('ActivitiStartProcessButton', () => {
|
||||
|
||||
});
|
||||
|
||||
describe('cancel dialog', () => {
|
||||
|
||||
let dialogPolyfill: any;
|
||||
|
||||
let setupDialog = (definitions?: any) => {
|
||||
if (definitions) {
|
||||
getDefinitionsSpy.and.returnValue(Observable.of(definitions));
|
||||
}
|
||||
component.showDialog();
|
||||
fixture.detectChanges();
|
||||
component.onProcessDefChange('my:process1');
|
||||
fixture.detectChanges();
|
||||
};
|
||||
|
||||
let clickCancelButton = () => {
|
||||
let closeButton: DebugElement = debugElement.query(By.css('[data-automation-id="btn-close"]'));
|
||||
closeButton.triggerEventHandler('click', null);
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
dialogPolyfill = { registerDialog: (widget) => widget.showModal = () => {} };
|
||||
dialogPolyfill.registerDialog = spyOn(dialogPolyfill, 'registerDialog').and.callThrough();
|
||||
window['dialogPolyfill'] = dialogPolyfill;
|
||||
});
|
||||
|
||||
it('should close dialog when cancel button clicked', async(() => {
|
||||
let closeSpy = spyOn(component.dialog.nativeElement, 'close');
|
||||
component.showDialog();
|
||||
fixture.detectChanges();
|
||||
clickCancelButton();
|
||||
expect(closeSpy).toHaveBeenCalled();
|
||||
}));
|
||||
|
||||
it('should clear processId and name when dialog cancelled', async(() => {
|
||||
setupDialog();
|
||||
clickCancelButton();
|
||||
expect(component.currentProcessDef.id).toBeNull();
|
||||
expect(component.name).toBe('');
|
||||
}));
|
||||
|
||||
it('should clear form values when dialog cancelled', async(() => {
|
||||
setupDialog(fakeProcessDefWithForm);
|
||||
fixture.whenStable().then(() => {
|
||||
component.startForm.data = {
|
||||
language: 'fr',
|
||||
upload: {}
|
||||
};
|
||||
fixture.detectChanges();
|
||||
clickCancelButton();
|
||||
expect(component.startForm.data['language']).toBeUndefined();
|
||||
expect(component.startForm.data['upload']).toBeUndefined();
|
||||
});
|
||||
}));
|
||||
|
||||
it('should register dialog via polyfill', () => {
|
||||
fixture.detectChanges();
|
||||
component.dialog.nativeElement.showModal = null;
|
||||
component.showDialog();
|
||||
expect(dialogPolyfill.registerDialog).toHaveBeenCalledWith(component.dialog.nativeElement);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
@@ -15,7 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { Component, EventEmitter, Input, Output, OnInit, ViewChild, DebugElement, OnChanges, SimpleChanges } from '@angular/core';
|
||||
import { Component, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
|
||||
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
|
||||
import { ActivitiStartForm } from 'ng2-activiti-form';
|
||||
import { ProcessInstance } from './../models/process-instance.model';
|
||||
@@ -26,23 +26,23 @@ declare let componentHandler: any;
|
||||
declare let dialogPolyfill: any;
|
||||
|
||||
@Component({
|
||||
selector: 'activiti-start-process-instance',
|
||||
selector: 'activiti-start-process',
|
||||
moduleId: module.id,
|
||||
templateUrl: './activiti-start-process.component.html',
|
||||
styleUrls: ['./activiti-start-process.component.css']
|
||||
})
|
||||
export class ActivitiStartProcessButton implements OnInit, OnChanges {
|
||||
export class ActivitiStartProcessInstance implements OnInit, OnChanges {
|
||||
|
||||
@Input()
|
||||
appId: string;
|
||||
|
||||
@Input()
|
||||
showStartButton: boolean = true;
|
||||
|
||||
@Output()
|
||||
start: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
|
||||
|
||||
@ViewChild('dialog')
|
||||
dialog: DebugElement;
|
||||
|
||||
@ViewChild('startForm')
|
||||
@ViewChild(ActivitiStartForm)
|
||||
startForm: ActivitiStartForm;
|
||||
|
||||
processDefinitions: ProcessDefinitionRepresentation[] = [];
|
||||
@@ -86,13 +86,6 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
|
||||
);
|
||||
}
|
||||
|
||||
public showDialog() {
|
||||
if (!this.dialog.nativeElement.showModal) {
|
||||
dialogPolyfill.registerDialog(this.dialog.nativeElement);
|
||||
}
|
||||
this.dialog.nativeElement.showModal();
|
||||
}
|
||||
|
||||
public startProcess() {
|
||||
if (this.currentProcessDef.id && this.name) {
|
||||
this.resetErrorMessage();
|
||||
@@ -101,7 +94,6 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
|
||||
(res) => {
|
||||
this.name = '';
|
||||
this.start.emit(res);
|
||||
this.cancel();
|
||||
},
|
||||
(err) => {
|
||||
this.errorMessageId = 'START_PROCESS.ERROR.START';
|
||||
@@ -111,11 +103,6 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
|
||||
}
|
||||
}
|
||||
|
||||
public cancel() {
|
||||
this.reset();
|
||||
this.dialog.nativeElement.close();
|
||||
}
|
||||
|
||||
onProcessDefChange(processDefinitionId) {
|
||||
let processDef = this.processDefinitions.find((processDefinition) => {
|
||||
return processDefinition.id === processDefinitionId;
|
||||
@@ -147,7 +134,7 @@ export class ActivitiStartProcessButton implements OnInit, OnChanges {
|
||||
this.errorMessageId = '';
|
||||
}
|
||||
|
||||
private reset() {
|
||||
public reset() {
|
||||
this.resetSelectedProcessDefinition();
|
||||
this.name = '';
|
||||
if (this.startForm) {
|
||||
|
Reference in New Issue
Block a user