aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-ui
diff options
context:
space:
mode:
authorKrupaNagabhushan <krupa.nagabhushan@est.tech>2021-06-09 22:11:46 +0100
committerChristophe Closset <christophe.closset@intl.att.com>2021-07-05 09:19:53 +0000
commitffce2fdab1c5f6efff795107ef7756d2e9fdcf57 (patch)
treed795b99028569a927df824c7d97418d4c9d12628 /catalog-ui
parent3453264c35275af52a2fdcde33f6e8347a65d15b (diff)
Refactor Substitution filters structure
The refactor removes unnecessary component id from the substitution filters structure, as the substitution filters belongs to and only to the component. This also avoid any copying issues during the new version creation, as there is not need to update the structure with a new component id. Issue-ID: SDC-3619 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: Ibcfd9be0c8ceb95d5c1c3bd3f21c3dec26c398f7
Diffstat (limited to 'catalog-ui')
-rw-r--r--catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.ts5
-rw-r--r--catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/substitution-filter-tab/substitution-filter-tab.component.ts2
-rw-r--r--catalog-ui/src/app/ng2/services/responses/component-generic-response.ts6
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;