summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsvishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>2018-04-23 10:10:51 +0300
committerEinav Keidar <einavw@amdocs.com>2018-04-23 09:08:50 +0000
commit6553339f446abdef8acb1d9969d6ab90aebffd8e (patch)
tree5d8baef563729f69039008d274fd2f8b34ef252d
parentaafdcc2c4373806401de81ae4cc32fa4c66cabd2 (diff)
validation btn & validation screen fix
Issue-ID: SDC-1237 Change-Id: I032476dd47817febb449c51ce8e46db8f3d395be Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
-rw-r--r--openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx1
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx11
2 files changed, 10 insertions, 2 deletions
diff --git a/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx b/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx
index 9530b6521d..550989688e 100644
--- a/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx
+++ b/openecomp-ui/src/nfvo-components/input/validation/ValidationButtons.jsx
@@ -64,6 +64,7 @@ class ValidationButtons extends React.Component {
<Button
type="submit"
btnType="primary"
+ size="default"
data-test-id="form-submit-button"
disabled={!this.state.isValid}>
{submitBtn}
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 814f9b38e0..2b4d5571f3 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/attachments/SoftwareProductAttachmentsView.jsx
@@ -152,14 +152,21 @@ class HeatScreenView extends Component {
}
onProcessAndValidate={onProcessAndValidate}
softwareProductId={softwareProductId}
- isReadOnlyMode={isReadOnlyMode}
+ isReadOnlyMode={
+ isReadOnlyMode ||
+ (candidateInProcess && !goToOverview) ||
+ !candidateInProcess
+ }
version={version}
/>
</Tab>
<Tab
tabId={tabsMapping.VALIDATION}
title="Validation"
- disabled={!isValidationAvailable || candidateInProcess}>
+ disabled={
+ goToOverview &&
+ (!isValidationAvailable || candidateInProcess)
+ }>
<HeatValidation {...other} />
</Tab>
</Tabs>