From b339514619bbd5b29a085ea47a93cf30353a71e2 Mon Sep 17 00:00:00 2001 From: Arundathi Patil Date: Wed, 8 Aug 2018 14:57:40 +0530 Subject: [PATCH] parameter-definition.service:removed hardcoded val Moved the hardcoded values from parameter-definition service to app-contants as variables. Issue-ID: APPC-1054 Change-Id: Ib61aea5eec6d9c87405179711a347a18e58b2c4a Signed-off-by: Arundathi Patil --- .../parameter-definitions/parameter-definition.service.ts | 9 +++++---- src/constants/app-constants.ts | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/vnfs/build-artifacts/parameter-definitions/parameter-definition.service.ts b/src/app/vnfs/build-artifacts/parameter-definitions/parameter-definition.service.ts index 2c13e4f..a2b503a 100644 --- a/src/app/vnfs/build-artifacts/parameter-definitions/parameter-definition.service.ts +++ b/src/app/vnfs/build-artifacts/parameter-definitions/parameter-definition.service.ts @@ -2,6 +2,8 @@ ============LICENSE_START========================================== =================================================================== Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + +Copyright (C) 2018 IBM. =================================================================== Unless otherwise specified, all software contained herein is licensed @@ -16,8 +18,6 @@ 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. - -ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END============================================ */ @@ -31,6 +31,7 @@ import {HttpUtilService} from '../../../shared/services/httpUtil/http-util.servi import {UtilityService} from '../../../shared/services/utilityService/utility.service'; import {NotificationsService} from 'angular2-notifications'; import 'rxjs/add/operator/map'; +import { appConstants } from '../../../../constants/app-constants'; let YAML = require('yamljs'); @@ -429,7 +430,7 @@ export class ParameterDefinitionService { public processKeyFile(fileName, result) { this.myKeyFileName = fileName; if (!this.myKeyFileName.endsWith('.txt')) { - this.nService.error('Error', 'Uploaded file is not a TXT file'); + this.nService.error(appConstants.notifications.titles.error, appConstants.errors.notTxtFileError); } this.parameterDefinitionMap = {}; var rows = result.split(/\r\n|\r|\n/g); @@ -463,7 +464,7 @@ export class ParameterDefinitionService { public processPDfile(fileName, result) { this.myPdFileName = fileName; if (!this.myPdFileName.endsWith('.yaml')) { - this.nService.error('Error', 'Uploaded file is not a YAML file'); + this.nService.error(appConstants.notifications.titles.error, appConstants.errors.notYAMLFileError); } var pdObject = YAML.parse(result); let fileModel = pdObject['vnf-parameter-list']; diff --git a/src/constants/app-constants.ts b/src/constants/app-constants.ts index 2baa1d7..290d299 100644 --- a/src/constants/app-constants.ts +++ b/src/constants/app-constants.ts @@ -32,7 +32,9 @@ export const appConstants = { "noValidTemplateIdentifierError": "Select a valid Template Identifier", "noAction&VNFTypeInRDscreenError": "Please enter Action and VNF type in Reference Data screen", "connectionError": "Error in connecting to APPC Server", - "multipleFileUploadError" : "Cannot upload multiple files on the entry" + "multipleFileUploadError" : "Cannot upload multiple files on the entry", + "notTxtFileError" : "Uploaded file is not a TXT file", + "notYAMLFileError" : "Uploaded file is not a YAML file" }, "tabs": [ { -- 2.16.6