diff options
Diffstat (limited to 'catalog-ui')
3 files changed, 6 insertions, 7 deletions
diff --git a/catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.ts b/catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.ts index aade8d8b73..e0754af549 100644 --- a/catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.ts +++ b/catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.ts @@ -157,9 +157,8 @@ export class SubstitutionFilterComponent { private loadSubstitutionFilter = (): void => { this.topologyTemplateService.getSubstitutionFilterConstraints(this.compositeService.componentType, this.compositeService.uniqueId) .subscribe((response) => { - if (response.substitutionFilterForTopologyTemplate && response.substitutionFilterForTopologyTemplate[this.compositeService.uniqueId]) { - this.constraintProperties = response. - substitutionFilterForTopologyTemplate[this.compositeService.uniqueId].properties; + if(response.substitutionFilters) { + this.constraintProperties = response.substitutionFilters.properties; } }); } diff --git a/catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/substitution-filter-tab/substitution-filter-tab.component.ts b/catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/substitution-filter-tab/substitution-filter-tab.component.ts index 2b5648c27f..c4101ab2bc 100644 --- a/catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/substitution-filter-tab/substitution-filter-tab.component.ts +++ b/catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/substitution-filter-tab/substitution-filter-tab.component.ts @@ -71,7 +71,7 @@ export class SubstitutionFilterTabComponent { public loadConstraints = (): void => { this.topologyTemplateService.getSubstitutionFilterConstraints(this.metaData.componentType, this.metaData.uniqueId).subscribe((response) => { - this.componentInstancesConstraints = response.substitutionFilterForTopologyTemplate; + this.componentInstancesConstraints = response.substitutionFilters; }); } diff --git a/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts b/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts index 784a3d0ac9..6011aabec8 100644 --- a/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts +++ b/catalog-ui/src/app/ng2/services/responses/component-generic-response.ts @@ -58,7 +58,7 @@ export class ComponentGenericResponse implements Serializable<ComponentGenericR public additionalInformation:any; public derivedList:Array<any>; public nodeFilterforNode: Array<any>; - public substitutionFilterForTopologyTemplate: Array<any>; + public substitutionFilters: any; public derivedFromGenericType; public derivedFromGenericVersion; @@ -129,8 +129,8 @@ export class ComponentGenericResponse implements Serializable<ComponentGenericR if(response.nodeFilterforNode) { this.nodeFilterforNode = response.nodeFilterforNode; } - if(response.substitutionFilterForTopologyTemplate) { - this.substitutionFilterForTopologyTemplate = response.substitutionFilterForTopologyTemplate; + if(response.substitutionFilters) { + this.substitutionFilters = response.substitutionFilters; } if(response.derivedFromGenericType) { this.derivedFromGenericType = response.derivedFromGenericType; |