From 32312ca12dc40f724d248104c16df5e46a4bc5cc Mon Sep 17 00:00:00 2001 From: KrupaNagabhushan Date: Mon, 20 Sep 2021 13:04:29 +0100 Subject: Fix child model being shown in UI Issue-ID: SDC-3734 Signed-off-by: KrupaNagabhushan Change-Id: Iadbbf93dc2a84a14df6b73a191d4c6d3e657f4d1 --- .../view-models/workspace/tabs/general/general-view-model.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'catalog-ui/src/app/view-models') 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 1bcf266c55..6c28fae508 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 @@ -489,7 +489,17 @@ export class GeneralViewModel { if (!this.$scope.isCreateMode() && this.$scope.isVspImport()){ this.modelService.getModels().subscribe((modelsFound: Model[]) => { - modelsFound.sort().forEach(model => {this.$scope.models.push(model.name)}); + modelsFound.sort().forEach(model => { + if (this.$scope.component.model != undefined) { + if (model.modelType == "NORMATIVE_EXTENSION") { + this.$scope.component.model = model.derivedFrom; + this.$scope.models.push(model.derivedFrom) + } else { + this.$scope.component.model = model.name; + this.$scope.models.push(model.name) + } + } + }); }); } else { this.modelService.getModelsOfType("normative").subscribe((modelsFound: Model[]) => { -- cgit 1.2.3-korg