diff options
author | svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com> | 2018-03-07 16:41:59 +0200 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-03-08 07:10:50 +0000 |
commit | 9a79dcedfaaf173d2f301bb18b1832a799b1bc2f (patch) | |
tree | 962ba0e0a228d12bae96a713d2298b9589e4f5d9 /openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx | |
parent | a5445100050e49e83f73424198d73cd72d672a4d (diff) |
heat validation tabs and download fix
Issue-ID: SDC-1084
Change-Id: I548c42c1cad316e336017269e6793d1750639e0a
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx')
-rw-r--r-- | openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx index 90dd7692bf..4ced98f314 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx @@ -44,12 +44,12 @@ class HeatScreenView extends Component { return ( <div className='vsp-attachments-view'> <div className='attachments-view-controllers'> - {(activeTab === tabsMapping.SETUP) && - <Button btnType='outline' + {(activeTab === tabsMapping.SETUP) && candidateInProcess && + <Button data-test-id='proceed-to-validation-btn' disabled={!isValidationAvailable} className='proceed-to-validation-btn' - onClick={()=>this.handleTabPress(tabsMapping.VALIDATION)}>{i18n('PROCEED TO VALIDATION')}</Button> + onClick={()=>this.validate()}>{i18n('PROCEED TO VALIDATION')}</Button> } {candidateInProcess && <SVGIcon onClick={onUploadAbort} @@ -73,7 +73,7 @@ class HeatScreenView extends Component { name='download' className='icon-component' color='dark-gray' - onClick={heatDataExist ? () => onDownload({heatCandidate: heatSetup, isReadOnlyMode, version}) : undefined} + onClick={heatDataExist ? () => onDownload({heatCandidate: heatSetup, isReadOnlyMode: isReadOnlyMode || !candidateInProcess, version}) : undefined} data-test-id='download-heat'/> <SVGIcon @@ -104,7 +104,7 @@ class HeatScreenView extends Component { isReadOnlyMode={isReadOnlyMode} version={version}/> </Tab> - <Tab tabId={tabsMapping.VALIDATION} title='Validation' disabled={!isValidationAvailable}> + <Tab tabId={tabsMapping.VALIDATION} title='Validation' disabled={!isValidationAvailable || candidateInProcess}> <HeatValidation {...other}/> </Tab> </Tabs> @@ -113,12 +113,10 @@ class HeatScreenView extends Component { } handleTabPress(key) { - let {heatSetup, heatSetupCache, onProcessAndValidate, isReadOnlyMode, version, setActiveTab} = this.props; + let {setActiveTab} = this.props; switch (key) { case tabsMapping.VALIDATION: - onProcessAndValidate({heatData: heatSetup, heatDataCache: heatSetupCache, isReadOnlyMode, version}).then( - () => setActiveTab({activeTab: tabsMapping.VALIDATION}) - ); + setActiveTab({activeTab: tabsMapping.VALIDATION}); return; case tabsMapping.SETUP: setActiveTab({activeTab: tabsMapping.SETUP}); @@ -139,7 +137,12 @@ class HeatScreenView extends Component { this.refs.hiddenImportFileInput.value = ''; this.props.onUpload(formData, version); } - + validate() { + let {heatSetup, heatSetupCache, onProcessAndValidate, isReadOnlyMode, version, setActiveTab} = this.props; + onProcessAndValidate({heatData: heatSetup, heatDataCache: heatSetupCache, isReadOnlyMode, version}).then( + () => setActiveTab({activeTab: tabsMapping.VALIDATION}) + ); + } save() { return this.props.onboardingOrigin === onboardingOriginTypes.ZIP ? |