Merge "VLM overview - refactor of edit description input"

2 files changed, 11 insertions, 6 deletions

diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/LicenseModelDescriptionEdit.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/LicenseModelDescriptionEdit.jsx
index 9232402b75..f4d6d4d42c 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/LicenseModelDescriptionEdit.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/LicenseModelDescriptionEdit.jsx
@@ -15,6 +15,7 @@
  */
 import React from 'react';
 import Input from 'nfvo-components/input/validation/Input.jsx';
+import i18n from 'nfvo-utils/i18n/i18n.js';
 
 class LicenseModelDescriptionEdit extends React.Component {
 	render() {
@@ -33,8 +34,8 @@ class LicenseModelDescriptionEdit extends React.Component {
 					type='textarea'/>
 				<div className='buttons-row'>
 					<div className='buttons-wrapper'>
-						<div onClick={() => this.onClose()} className='description-button' data-test-id='vlm-summary-vendor-desc-cancel-btn'>cancel</div>
-						<div onClick={() => this.submit()}  className={saveButtonClassName} data-test-id='vlm-summary-vendor-desc-save-btn'>save</div>
+						<div onClick={() => this.submit()}  className={saveButtonClassName} data-test-id='vlm-summary-vendor-desc-save-btn'>{i18n('Save')}</div>
+						<div onClick={() => this.onClose()} className='description-button' data-test-id='vlm-summary-vendor-desc-cancel-btn'>{i18n('Cancel')}</div>
 					</div>
 				</div>
 			</div>
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js
index deb4550347..532ca32f8e 100644
--- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js
+++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/overview/summary/VendorDataView.js
@@ -26,8 +26,8 @@ import LicenseModelDescriptionEdit from './LicenseModelDescriptionEdit.jsx';
 import VersionControllerUtils from 'nfvo-components/panel/versionController/VersionControllerUtils.js';
 import {VLM_DESCRIPTION_FORM} from '../LicenseModelOverviewConstants.js';
 
-export const mapStateToProps = ({licenseModel: {licenseModelEditor: {data}, licenseModelOverview: {descriptionEditor: {data: descriptionData, genericFieldInfo} }}}) => {
-	let description = (descriptionData && descriptionData.description) ? descriptionData.description : null;
+export const mapStateToProps = ({licenseModel: {licenseModelEditor: {data}, licenseModelOverview: {descriptionEditor: {data: descriptionData = {}, genericFieldInfo} }}}) => {
+	let {description} = descriptionData;
 	let isReadOnlyMode = VersionControllerUtils.isReadOnly(data);
 	return {
 		data,
@@ -57,12 +57,16 @@ export class VendorDataView extends Component {
 				<div className='vendor-title'>vendor</div>
 				<div className='vendor-name' data-test-id='vlm-summary-vendor-name'>{vendorName}</div>
 				{
-					description && !isReadOnlyMode ? this.renderDescriptionEdit() : this.renderDescription()
+					description !== undefined && !isReadOnlyMode ? this.renderDescriptionEdit() : this.renderDescription()
 				}
 			</div>
 		);
 	}
 
+	componentWillUnmount() {
+		this.props.onCancel();
+	}
+
 
 	renderDescription() {
 		let {data: {description}, onVendorDescriptionEdit, isReadOnlyMode} = this.props;
@@ -71,7 +75,7 @@ export class VendorDataView extends Component {
 				{this.renderOverlay(
 					<div className='description-data' data-test-id='vlm-summary-vendor-description'>
 						{description}
-						<SVGIcon name='pencil'/>
+						{!isReadOnlyMode && <SVGIcon name='pencil'/>}
 					</div>
 				)}
 			</div>