VLM overview - refactor of edit description input

Change-Id: I8ba60ecdd9febacdf77bc354bd969462d8bae3e6
Issue-ID: SDC-552
Signed-off-by: miriame <miriam.eini@amdocs.com>

1 files changed, 8 insertions, 4 deletions

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>