From 5816f717507a2edc5fdc17cfee579358f2949961 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Thu, 10 Mar 2022 12:25:14 +0000 Subject: Fix update node filter capability Signed-off-by: MichaelMorris Issue-ID: SDC-3905 Change-Id: If7629a20e4eb6034d14faf736cf3a9bec91d9d28 --- .../service-dependencies/service-dependencies.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts') diff --git a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts index 8500269420..70d545aa49 100644 --- a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts +++ b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts @@ -31,7 +31,7 @@ import { ComponentMetadata } from '../../../../models/component-metadata'; import { ServiceInstanceObject } from '../../../../models/service-instance-properties-and-interfaces'; import { TopologyTemplateService } from '../../../services/component-services/topology-template.service'; import {CapabilitiesFilterPropertiesEditorComponent} from "../../../pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component"; -import {CapabilitiesConstraintObject} from "../capabilities-constraint/capabilities-constraint.component"; +import { CapabilitiesConstraintObjectUI} from "../capabilities-constraint/capabilities-constraint.component"; import {ToscaFilterConstraintType} from "../../../../models/tosca-filter-constraint-type.enum"; export class ConstraintObject { @@ -136,7 +136,7 @@ export class ServiceDependenciesComponent { parentServiceInputs: InputBEModel[] = []; parentServiceProperties: PropertyBEModel[] = []; constraintProperties: ConstraintObject[] = []; - constraintCapabilities: CapabilitiesConstraintObject[] = []; + constraintCapabilities: CapabilitiesConstraintObjectUI[] = []; operatorTypes: any[]; capabilities: string = ToscaFilterConstraintType.CAPABILITIES; properties: string = ToscaFilterConstraintType.PROPERTIES; @@ -151,7 +151,7 @@ export class ServiceDependenciesComponent { @Input() selectedInstanceProperties: PropertyBEModel[] = []; @Output() updateRulesListEvent: EventEmitter = new EventEmitter(); @Output() updateNodeFilterProperties: EventEmitter = new EventEmitter(); - @Output() updateNodeFilterCapabilities: EventEmitter = new EventEmitter(); + @Output() updateNodeFilterCapabilities: EventEmitter = new EventEmitter(); @Output() loadRulesListEvent:EventEmitter = new EventEmitter(); @Output() dependencyStatus = new EventEmitter(); @@ -216,7 +216,7 @@ export class ServiceDependenciesComponent { this.componentInstancesConstraints = response.nodeFilterforNode; const nodeFilterPropertiesResponse: ConstraintObject[] = response.nodeFilterforNode[this.currentServiceInstance.uniqueId].properties; this.constraintProperties = nodeFilterPropertiesResponse; - const nodeFilterCapabilitiesResponse: CapabilitiesConstraintObject[] = response.nodeFilterforNode[this.currentServiceInstance.uniqueId].capabilities; + const nodeFilterCapabilitiesResponse: CapabilitiesConstraintObjectUI[] = response.nodeFilterforNode[this.currentServiceInstance.uniqueId].capabilities; this.constraintCapabilities = nodeFilterCapabilitiesResponse; } }); @@ -352,7 +352,7 @@ export class ServiceDependenciesComponent { this.topologyTemplateService.createServiceFilterCapabilitiesConstraints( this.compositeService.uniqueId, this.currentServiceInstance.uniqueId, - new CapabilitiesConstraintObject(this.modalInstance.instance.dynamicContent.instance.currentRule), + new CapabilitiesConstraintObjectUI(this.modalInstance.instance.dynamicContent.instance.currentRule), this.compositeService.componentType, constraintType ).subscribe( (response) => { @@ -375,7 +375,7 @@ export class ServiceDependenciesComponent { CapabilitiesFilterPropertiesEditorComponent, { serviceRuleIndex: index, - serviceRules: _.map(this.constraintCapabilities, (rule) => new CapabilitiesConstraintObject(rule)), + serviceRules: _.map(this.constraintCapabilities, (rule) => new CapabilitiesConstraintObjectUI(rule)), currentServiceName: this.currentServiceInstance.name, operatorTypes: this.operatorTypes, compositeServiceName: this.compositeService.name, @@ -438,7 +438,7 @@ export class ServiceDependenciesComponent { this.topologyTemplateService.updateServiceFilterCapabilitiesConstraint( this.compositeService.uniqueId, this.currentServiceInstance.uniqueId, - new CapabilitiesConstraintObject(this.modalInstance.instance.dynamicContent.instance.currentRule), + new CapabilitiesConstraintObjectUI(this.modalInstance.instance.dynamicContent.instance.currentRule), this.compositeService.componentType, constraintType, index -- cgit 1.2.3-korg