From 6692cde32bc3e588cfb6bf30fd99e21a903e0444 Mon Sep 17 00:00:00 2001
From: "andre.schmid" <andre.schmid@est.tech>
Date: Tue, 16 Jul 2019 10:01:17 +0000
Subject: Fix view attachment for onboarded CSAR packages

Fixes the problem to view attachments for a onboarded CSAR package.
Every time the attachments link was clicked the process package was
being called. The package processing can only happen once, while
uploading the package. This solution changes the Attachment link
action to a view action without package processing.

Change-Id: I5bded800c060adfb8cc80a8512bc8eecf07557b8
Issue-ID: SDC-2443
Signed-off-by: andre.schmid <andre.schmid@est.tech>
---
 .../src/sdc-app/common/helpers/ScreensHelper.js        |  7 +++++++
 .../src/sdc-app/onboarding/OnboardingActionHelper.js   | 18 +++++++++++++++++-
 .../src/sdc-app/onboarding/OnboardingConstants.js      |  6 ++++--
 .../onboarding/softwareProduct/SoftwareProduct.js      |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)

(limited to 'openecomp-ui')

diff --git a/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js b/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js
index 58f47957de..afa5a42f83 100644
--- a/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js
+++ b/openecomp-ui/src/sdc-app/common/helpers/ScreensHelper.js
@@ -179,6 +179,13 @@ const ScreensHelper = {
                             vspProps
                         );
                         break;
+                    case enums.SCREEN
+                        .SOFTWARE_PRODUCT_ATTACHMENTS_VIEW_VALIDATION:
+                        OnboardingActionHelper.viewSoftwareProductAttachmentsValidationTab(
+                            dispatch,
+                            vspProps
+                        );
+                        break;
                     case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES:
                         OnboardingActionHelper.navigateToSoftwareProductProcesses(
                             dispatch,
diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js
index 8385da750f..754c11206d 100644
--- a/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js
@@ -355,7 +355,23 @@ const OnboardingActionHelper = {
             );
         });
     },
-
+    viewSoftwareProductAttachmentsValidationTab(
+        dispatch,
+        { softwareProductId, version, status }
+    ) {
+        SoftwareProductActionHelper.loadSoftwareProductHeatCandidate(dispatch, {
+            softwareProductId,
+            version
+        });
+        SoftwareProductAttachmentsActionHelper.setActiveTab(dispatch, {
+            activeTab: attachmentsTabsMapping.VALIDATION
+        });
+        setCurrentScreen(dispatch, enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS, {
+            softwareProductId,
+            version,
+            status
+        });
+    },
     navigateToSoftwareProductProcesses(
         dispatch,
         { softwareProductId, version, status }
diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingConstants.js b/openecomp-ui/src/sdc-app/onboarding/OnboardingConstants.js
index cf8ff12387..919344e366 100644
--- a/openecomp-ui/src/sdc-app/onboarding/OnboardingConstants.js
+++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingConstants.js
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -95,6 +95,8 @@ export const enums = keyMirror({
             'SOFTWARE_PRODUCT_ATTACHMENTS_SETUP',
         SOFTWARE_PRODUCT_ATTACHMENTS_VALIDATION:
             'SOFTWARE_PRODUCT_ATTACHMENTS_VALIDATION',
+        SOFTWARE_PRODUCT_ATTACHMENTS_VIEW_VALIDATION:
+            'SOFTWARE_PRODUCT_ATTACHMENTS_VIEW_VALIDATION',
         SOFTWARE_PRODUCT_PROCESSES: breadcrumbsEnum.SOFTWARE_PRODUCT_PROCESSES,
         SOFTWARE_PRODUCT_DEPLOYMENT:
             breadcrumbsEnum.SOFTWARE_PRODUCT_DEPLOYMENT,
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js
index 1362165d1f..e34fb5131b 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js
@@ -576,7 +576,7 @@ const mapActionsToProps = (
                             ) {
                                 nextScreen =
                                     enums.SCREEN
-                                        .SOFTWARE_PRODUCT_ATTACHMENTS_VALIDATION;
+                                        .SOFTWARE_PRODUCT_ATTACHMENTS_VIEW_VALIDATION;
                             }
                         }
                         ScreensHelper.loadScreen(dispatch, {
-- 
cgit 1.2.3-korg