1 files changed, 31 insertions, 7 deletions

diff --git a/openecomp-ui/src/sdc-app/flows/FlowsEditorModalView.jsx b/openecomp-ui/src/sdc-app/flows/FlowsEditorModalView.jsx
index 8441c7d1d6..1250a0b58e 100644
--- a/openecomp-ui/src/sdc-app/flows/FlowsEditorModalView.jsx
+++ b/openecomp-ui/src/sdc-app/flows/FlowsEditorModalView.jsx
@@ -1,30 +1,54 @@
+/*!
+ * 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 React, {Component} from 'react';
 import i18n from 'nfvo-utils/i18n/i18n.js';
-import Input from 'nfvo-components/input/validation/ValidationInput.jsx';
-import Form from 'nfvo-components/input/validation/ValidationForm.jsx';
+import Input from 'nfvo-components/input/validation/Input.jsx';
+import Form from 'nfvo-components/input/validation/Form.jsx';
 
 class FlowsEditorModalView extends Component {
 
 	render() {
-		let {onCancel, onDataChanged, currentFlow} = this.props;
+		let {onCancel, onDataChanged, currentFlow, genericFieldInfo, formReady, isFormValid, onValidateForm} = this.props;
 		let {artifactName, description} = currentFlow;
 		return (
-			<Form onSubmit={() => this.onSaveClicked()} onReset={onCancel}>
+			<div>
+				{genericFieldInfo && <Form
+					onSubmit={() => this.onSaveClicked()}
+					onReset={onCancel} formReady={formReady} isValid={isFormValid} onValidateForm={() => onValidateForm()} >
 				<Input
 					type='text'
 					name='name'
 					label={i18n('Name')}
-					validations={{required: true}}
+					isValid={genericFieldInfo['artifactName'].isValid}
+					errorText={genericFieldInfo['artifactName'].errorText}
+					isRequired={true}
 					value={artifactName}
 					onChange={artifactName => onDataChanged({artifactName})}/>
 				<Input
 					type='textarea'
 					name='description'
 					label={i18n('Description')}
-					validations={{required: true}}
+					isValid={genericFieldInfo['description'].isValid}
+					errorText={genericFieldInfo['description'].errorText}
+					isRequired={true}
 					value={description}
+					overlayPos='bottom'
 					onChange={description => onDataChanged({description})}/>
-			</Form>
+			</Form> }
+			</div>
 		);
 	}