From 7f0939f148645d3b47653dbee7fadc341b16c1c2 Mon Sep 17 00:00:00 2001 From: "Mohamed Asgar Samiulla(ma926a)" Date: Tue, 17 Apr 2018 15:14:28 +0530 Subject: VM data retrieval from APPC for open stack action VM data retrieval and stopping user not to navigate to PD and template if mandatory fields are missing in reference data. Issue-ID: APPC-853 Change-Id: Id43500579c6d222a2c17a53db9213372afec565f Signed-off-by: Mohamed Asgar Samiulla(ma926a) --- .../parameter-definitions/parameter.component.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts') diff --git a/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts b/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts index e7e60c3..80269cb 100644 --- a/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts +++ b/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts @@ -185,7 +185,7 @@ export class ParameterComponent implements OnInit { public artifactName; public appDataObject: any; public downloadDataObject: any; - public artifact_fileName; + public artifact_fileName=""; identifier: any; private selectedActionReference: any; @@ -213,12 +213,13 @@ export class ParameterComponent implements OnInit { if (artifactList[i]['artifact-type'] === 'parameter_definitions') { var artifactName = artifactList[i]['artifact-name']; var artifactNameWithoutExtension = ''; - if (artifactName) artifactNameWithoutExtension = artifactName.substring(0, artifactName.lastIndexOf(".")) - var identifier = artifactNameWithoutExtension.split("_"); - var id = ''; - if (identifier) id = identifier[identifier.length - 1]; - if (this.mappingEditorService.identifier) { - if (id === this.mappingEditorService.identifier) this.artifact_fileName = artifactName; + if (artifactName) { + artifactNameWithoutExtension = artifactName.substring(0, artifactName.lastIndexOf(".")); + } + if(this.mappingEditorService.identifier) { + if(artifactNameWithoutExtension.endsWith(this.mappingEditorService.identifier)) { + this.artifact_fileName = artifactName; + } } else { -- cgit 1.2.3-korg