commit f27d5549734324727a5432f6ff663b0880425f47
author sj108s <sj108s@us.att.com> Mon Apr 02 14:46:25 2018 +0530
committer Skip Wonnell <skip@att.com> Tue Apr 03 09:23:23 2018 -0500
tree 4e4e2908965513412048e468eb7e241ebfe5c8db
parent ebec20faa45e710f52ee0f29eccd05adec35762e

Corrected artifact name for multiple template ids

Made changes in param name value component ts for setting correct
artifact name while saving and retrieving artifacts, in case of multiple
template ids.

Issue-ID: APPC-812
Change-Id: I973f7b763f4c2204425fceb77cdae33944ba3c8d
Signed-off-by: sj108s <sj108s@us.att.com>

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 effd854..e7e60c3 100644
--- a/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts
+++ b/src/app/vnfs/build-artifacts/parameter-definitions/parameter.component.ts
@@ -17,7 +17,6 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ============LICENSE_END============================================
 */
 
@@ -190,7 +189,7 @@
     identifier: any;
     private selectedActionReference: any;
 
-    constructor (private httpService: HttpUtilService,
+    constructor(private httpService: HttpUtilService,
         private parameterDefinitionService: ParameterDefinitionService,
         private paramShareService: ParamShareService,
         private mappingEditorService: MappingEditorService,
@@ -212,7 +211,19 @@
             for (let i = 0; i < this.selectedActionReference['artifact-list'].length; i++) {
                 let artifactList = this.selectedActionReference['artifact-list'];
                 if (artifactList[i]['artifact-type'] === 'parameter_definitions') {
-                    this.artifact_fileName = artifactList[i]['artifact-name'];
+                    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;
+
+                    }
+                    else {
+                        this.artifact_fileName = artifactName;
+                    }
                 }
             }
             this.parameterDefinitionService.setValues(this.vnfType, this.vnfcType, this.protocol, this.action, this.artifact_fileName);