From d1bc5a608a399bf24fa24126f07f29cb6613ab4d Mon Sep 17 00:00:00 2001 From: Silviu Popa Date: Tue, 14 May 2019 17:19:44 +0300 Subject: [PATCH] [ADF-4389] StartProcessCloud - add validation for processName (#4707) * [ADF-4389] StartProcessCloud - add validation for processName * [ADF-4389] - change function definition name * [ADF-4389] - add return type --- .../cloud/start-process-cloud-demo.component.ts | 2 +- .../components/start-process-cloud.component.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts index 47def2087a..884169eb99 100644 --- a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts +++ b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts @@ -55,6 +55,6 @@ export class StartProcessCloudDemoComponent implements OnInit { } openSnackMessage(event: any) { - this.notificationService.openSnackMessage(event.response.body.message); + this.notificationService.openSnackMessage(event.response.body.entry.message); } } diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts index cbc55641bd..02b0123bde 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts @@ -122,11 +122,11 @@ export class StartProcessCloudComponent implements OnChanges, OnInit { } private getProcessDefinitionList(processDefinitionName: string): ProcessDefinitionCloud[] { - return this.processDefinitionList.filter((option) => option.name && option.name.toLowerCase().includes(processDefinitionName.toLowerCase())); + return this.processDefinitionList.filter((option) => this.isValidName(option.name) && option.name.toLowerCase().includes(processDefinitionName.toLowerCase())); } private getProcessIfExists(processDefinitionName: string): ProcessDefinitionCloud { - let matchedProcess = this.processDefinitionList.find((option) => option.name.toLowerCase() === processDefinitionName.toLowerCase()); + let matchedProcess = this.processDefinitionList.find((option) => this.isValidName(option.name) && option.name.toLowerCase() === processDefinitionName.toLowerCase()); if (!matchedProcess) { matchedProcess = new ProcessDefinitionCloud(); } @@ -162,6 +162,10 @@ export class StartProcessCloudComponent implements OnChanges, OnInit { }); } + private isValidName(name: string): boolean { + return !!name; + } + isProcessDefinitionsEmpty(): boolean { return this.processDefinitionList.length === 0; }