From 6553339f446abdef8acb1d9969d6ab90aebffd8e Mon Sep 17 00:00:00 2001
From: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
Date: Mon, 23 Apr 2018 10:10:51 +0300
Subject: validation btn & validation screen fix

Issue-ID: SDC-1237
Change-Id: I032476dd47817febb449c51ce8e46db8f3d395be
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
---
 .../nfvo-components/input/validation/ValidationButtons.jsx    |  1 +
 .../attachments/SoftwareProductAttachmentsView.jsx            | 11 +++++++++--
 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>
-- 
cgit 1.2.3-korg