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

[AAE-6310] Fix for attaching files (#7457)

Browse Source 
* [AAE-6310] Fix for attaching files

* [AAE-6310] Update

* [AAE-6310] Revert indentions changes

* [AAE-6310] Fix tests
This commit is contained in:
Bartosz Sekuła
2022-01-24 12:36:35 +01:00
committed by GitHub
parent 4de725e559
commit bf77663d6a
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts
View File

@@ -44,6 +44,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { ProcessNameCloudPipe } from '../../../pipes/process-name-cloud.pipe'; import { ProcessNameCloudPipe } from '../../../pipes/process-name-cloud.pipe';
import { ProcessInstanceCloud } from '../models/process-instance-cloud.model'; import { ProcessInstanceCloud } from '../models/process-instance-cloud.model';
import { ESCAPE } from '@angular/cdk/keycodes'; import { ESCAPE } from '@angular/cdk/keycodes';
import { ProcessDefinitionCloud } from 'process-services-cloud';
describe('StartProcessCloudComponent', () => { describe('StartProcessCloudComponent', () => {
@@ -827,17 +828,32 @@ describe('StartProcessCloudComponent', () => {
expect(component.processInstanceName.value).toEqual('fake-transformed-name'); expect(component.processInstanceName.value).toEqual('fake-transformed-name');
}); });
it('should set the process name on init when a process definition name is present', () => { it('should set the process name on when a process definition name is present', (done) => {
const definitions: ProcessDefinitionCloud[] = [{
appName: 'app',
appVersion: 1,
category: '',
description: '',
id: 'id',
key: 'key',
name: 'fake-name',
version: 1
}];
component.processInstanceName.valueChanges.subscribe((value) => {
expect(value).toBe(fakeTransformedName);
done();
});
getDefinitionsSpy.and.returnValue(of(definitions));
const processNameCloudPipe = TestBed.inject(ProcessNameCloudPipe); const processNameCloudPipe = TestBed.inject(ProcessNameCloudPipe);
const fakeTransformedName = 'fake-transformed-name'; const fakeTransformedName = 'fake-transformed-name';
spyOn(processNameCloudPipe, 'transform').and.returnValue(fakeTransformedName); spyOn(processNameCloudPipe, 'transform').and.returnValue(fakeTransformedName);
component.processDefinitionName = 'fake-name'; component.processDefinitionName = 'fake-name';
component.ngOnInit(); const change = new SimpleChange(null, 'MyApp', true);
component.ngOnChanges({ 'appName': change });
expect(component.processInstanceName.dirty).toBe(true);
expect(component.processInstanceName.touched).toBe(true);
expect(component.processInstanceName.value).toEqual(fakeTransformedName);
}); });
it('should cancel bubbling a keydown event ()', () => { it('should cancel bubbling a keydown event ()', () => {

16
lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
View File

@@ -139,14 +139,6 @@ export class StartProcessCloudComponent implements OnChanges, OnInit, OnDestroy
this.currentCreatedProcess = res; this.currentCreatedProcess = res;
this.disableStartButton = false; this.disableStartButton = false;
}); });
if (this.processDefinitionName) {
this.processDefinition.setValue(this.processDefinitionName);
this.processDefinition.markAsDirty();
this.processDefinition.markAsTouched();
this.setDefaultProcessName(this.processDefinitionName);
}
} }
ngOnChanges(changes: SimpleChanges) { ngOnChanges(changes: SimpleChanges) {
@@ -197,6 +189,7 @@ export class StartProcessCloudComponent implements OnChanges, OnInit, OnDestroy
private selectProcessDefinitionByProcesDefinitionName(processDefinitionName: string): void { private selectProcessDefinitionByProcesDefinitionName(processDefinitionName: string): void {
this.filteredProcesses = this.getProcessDefinitionListByNameOrKey(processDefinitionName); this.filteredProcesses = this.getProcessDefinitionListByNameOrKey(processDefinitionName);
if (this.isProcessFormValid() && if (this.isProcessFormValid() &&
this.filteredProcesses && this.filteredProcesses.length === 1) { this.filteredProcesses && this.filteredProcesses.length === 1) {
this.setProcessDefinitionOnForm(this.filteredProcesses[0].name); this.setProcessDefinitionOnForm(this.filteredProcesses[0].name);
@@ -252,6 +245,13 @@ export class StartProcessCloudComponent implements OnChanges, OnInit, OnDestroy
this.selectDefaultProcessDefinition(); this.selectDefaultProcessDefinition();
} else if (this.processDefinitionName) { } else if (this.processDefinitionName) {
this.processDefinition.setValue(this.processDefinitionName); this.processDefinition.setValue(this.processDefinitionName);
const processDefinition = this.processDefinitionList.find(process => process.name === this.processDefinitionName);
if (processDefinition) {
this.filteredProcesses = this.getProcessDefinitionListByNameOrKey(processDefinition.name);
this.setProcessDefinitionOnForm(processDefinition.name);
this.processDefinitionSelectionChanged(processDefinition);
}
} }
}, },
() => { () => {