diff options
Diffstat (limited to 'openecomp-ui/src/nfvo-utils')
| -rw-r--r-- | openecomp-ui/src/nfvo-utils/Validator.js | 5 | ||||
| -rw-r--r-- | openecomp-ui/src/nfvo-utils/getValue.js | 44 |
2 files changed, 48 insertions, 1 deletions
diff --git a/openecomp-ui/src/nfvo-utils/Validator.js b/openecomp-ui/src/nfvo-utils/Validator.js index 8fcf24a714..1df82a2ada 100644 --- a/openecomp-ui/src/nfvo-utils/Validator.js +++ b/openecomp-ui/src/nfvo-utils/Validator.js @@ -20,7 +20,9 @@ import i18n from 'nfvo-utils/i18n/i18n.js'; class Validator { static get globalValidationFunctions() { return { - required: value => value !== '', + required: value => { + return typeof value === 'string' ? value.replace(/\s+/g, '') !== '' : value !== ''; + }, requiredChooseOption: value => value !== '', maxLength: (value, length) => ValidatorJS.isLength(value, {max: length}), minLength: (value, length) => ValidatorJS.isLength(value, {min: length}), @@ -107,6 +109,7 @@ class Validator { } static isItemNameAlreadyExistsInList({itemId, itemName, list}) { + itemName = itemName.toLowerCase(); return list[itemName] && list[itemName] !== itemId; } } diff --git a/openecomp-ui/src/nfvo-utils/getValue.js b/openecomp-ui/src/nfvo-utils/getValue.js new file mode 100644 index 0000000000..101655bf31 --- /dev/null +++ b/openecomp-ui/src/nfvo-utils/getValue.js @@ -0,0 +1,44 @@ +/*! + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * + * 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. See the License for the specific language governing + * permissions and limitations under the License. + */ +import {other as optionInputOther} from 'nfvo-components/input/validation/InputOptions.jsx'; + +function getValueFromObject(element) { + return element.choices && element.choices.length > 0 && element.choices[0] !== '' && element.choices[0] !== optionInputOther.OTHER || + element.other && element.choices[0] === optionInputOther.OTHER ? + element : undefined; +} + +function getValueFromVariable(variable) { + return variable ? variable : undefined; +} + + let getValue = element => { + return typeof element === 'object' ? getValueFromObject(element) : getValueFromVariable(element); + }; + +export function getStrValue(choiceObject) { + if (!choiceObject) { + return undefined; + } + if (choiceObject.choice && choiceObject.choice !== '' && choiceObject.choice !== optionInputOther.OTHER) { + return choiceObject.choice; + } + else if (choiceObject.other && choiceObject.choice === optionInputOther.OTHER) { + return choiceObject.other; + } +} + + export default getValue; |