diff options
Diffstat (limited to 'catalog-ui/src')
3 files changed, 16 insertions, 3 deletions
diff --git a/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts b/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts index ed61dce192..d5528c5197 100644 --- a/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts +++ b/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts @@ -32,6 +32,9 @@ export class CompositionPaletteService { let model = this.workspaceService.metadata.model if (model) { params = params.append('componentModel', model); + if (this.workspaceService.getMetadataType() === 'SERVICE'){ + params = params.append('includeNormativeExtensionModels', 'true'); + } } const loadInstances = this.http.get(this.facadeUrl, {params}); const loadGroups = this.http.get(this.baseUrl + 'groupTypes', {params}); diff --git a/catalog-ui/src/app/ng2/services/model.service.ts b/catalog-ui/src/app/ng2/services/model.service.ts index 10ad4142de..83e16b12c7 100644 --- a/catalog-ui/src/app/ng2/services/model.service.ts +++ b/catalog-ui/src/app/ng2/services/model.service.ts @@ -35,4 +35,8 @@ export class ModelService { return this.http.get<Model[]>(this.baseUrl + "/v1/catalog/model"); } + getModelsOfType(type: string):Observable<Model[]> { + return this.http.get<Model[]>(this.baseUrl + "/v1/catalog/model?modelType=" + type); + } + } 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 c319b806c0..dd1fa464bf 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 @@ -485,9 +485,15 @@ export class GeneralViewModel { return; } - this.modelService.getModels().subscribe((modelsFound: Model[]) => { - modelsFound.forEach(model => {this.$scope.models.push({id: model.name, name: model.name})}); - }); + if (!this.$scope.isCreateMode() && this.$scope.isVspImport()){ + this.modelService.getModels().subscribe((modelsFound: Model[]) => { + modelsFound.forEach(model => {this.$scope.models.push({id: model.name, name: model.name})}); + }); + } else { + this.modelService.getModelsOfType("normative").subscribe((modelsFound: Model[]) => { + modelsFound.forEach(model => {this.$scope.models.push({id: model.name, name: model.name})}); + }); + } this.$scope.models.sort(function (model1, model2) { if (model1.id > model2.id) { |