From: shikha0203 <shivani.khare@est.tech>
Date: Tue, 30 May 2023 16:05:12 +0000 (+0100)
Subject: Actual sub mapping node not used during import
X-Git-Tag: 1.13.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F134721%2F4;p=sdc.git

Actual sub mapping node not used during import

Issue-ID: SDC-4518
Signed-off-by: shikha0203 <shivani.khare@est.tech>
Change-Id: I56f7334fac3e2cdd54c68850909370fe7b52ea38
---

diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts
index f550ccf355..685f564f27 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts
@@ -929,6 +929,13 @@ export class GeneralViewModel {
                     }
                 });
             }
+            if((<Service>this.$scope.component).derivedFromGenericType) {
+                baseTypeResponseList.baseTypes.forEach(baseTypeObj => {
+                    if(baseTypeObj.toscaResourceName == (<Service>this.$scope.component).derivedFromGenericType) {
+                        baseType = baseTypeObj;
+                    }
+                });
+            }
             baseType.versions.reverse().forEach(version => this.$scope.baseTypeVersions.push(version));
             this.$scope.component.derivedFromGenericType = baseType.toscaResourceName;
             this.$scope.component.derivedFromGenericVersion = this.$scope.baseTypeVersions[0];