From 16a9fce0e104a38371a9e5a567ec611ae3fc7f33 Mon Sep 17 00:00:00 2001 From: ys9693 Date: Sun, 19 Jan 2020 13:50:02 +0200 Subject: Catalog alignment Issue-ID: SDC-2724 Signed-off-by: ys9693 Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe --- catalog-ui/src/app/models/validation-config.ts | 39 ++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) (limited to 'catalog-ui/src/app/models/validation-config.ts') diff --git a/catalog-ui/src/app/models/validation-config.ts b/catalog-ui/src/app/models/validation-config.ts index ac15d2850e..0e594fd63c 100644 --- a/catalog-ui/src/app/models/validation-config.ts +++ b/catalog-ui/src/app/models/validation-config.ts @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,9 +24,16 @@ class PropertyValue { } class validationPatterns { - string: string; - comment:string; - integer: string; + vendorRelease: RegExp; + stringOrEmpty: string; + vendorName: RegExp; + vendorModelNumber: RegExp; + tag: RegExp; + contactId: RegExp; + componentName: RegExp; + string: RegExp; + comment:RegExp; + integer: RegExp; } export class Validations { @@ -38,3 +45,25 @@ export class ValidationConfiguration { static validation: Validations; } + +export class Validation { + componentNameValidationPattern:RegExp; + contactIdValidationPattern:RegExp; + tagValidationPattern:RegExp; + VendorReleaseValidationPattern:RegExp; + VendorNameValidationPattern:RegExp; + VendorModelNumberValidationPattern:RegExp; + commentValidationPattern:RegExp; + + constructor(validationData?:Validations) { + if(validationData) { + this.commentValidationPattern = validationData.validationPatterns.comment; + this.componentNameValidationPattern = validationData.validationPatterns.componentName; + this.contactIdValidationPattern = validationData.validationPatterns.contactId; + this.tagValidationPattern = validationData.validationPatterns.tag; + this.VendorModelNumberValidationPattern = validationData.validationPatterns.vendorModelNumber; + this.VendorNameValidationPattern = validationData.validationPatterns.vendorName; + this.VendorReleaseValidationPattern = validationData.validationPatterns.vendorRelease; + } + } +} -- cgit 1.2.3-korg