From 92b18f188105d5ba4b2c469cdfaedc7d2953d593 Mon Sep 17 00:00:00 2001
From: "andre.schmid" <andre.schmid@est.tech>
Date: Wed, 10 Aug 2022 14:50:08 +0100
Subject: Support TOSCA functions in Node Filters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds support to use tosca functions as value in the node property
filters and substitution filters

Change-Id: Id242691cc9ddd233245b58f052b9f0e2c7bbd66b
Issue-ID: SDC-4128
Signed-off-by: André Schmid <andre.schmid@est.tech>
---
 .../capabilities-filter-properties-editor.component.ts       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.ts')

diff --git a/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.ts b/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.ts
index 7e3bc69835..b59591bd06 100644
--- a/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.ts
+++ b/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.ts
@@ -21,12 +21,12 @@
 
 import {Component} from '@angular/core';
 import {InputBEModel, PropertyBEModel, PropertyModel} from 'app/models';
-import {OPERATOR_TYPES} from 'app/ng2/components/logic/service-dependencies/service-dependencies.component';
 import {DropdownValue} from 'app/ng2/components/ui/form-components/dropdown/ui-element-dropdown.component';
 import {ServiceServiceNg2} from 'app/ng2/services/component-services/service.service';
 import {PROPERTY_DATA} from 'app/utils';
 import {ServiceInstanceObject} from '../../../../models/service-instance-properties-and-interfaces';
-import {CapabilitiesConstraintObjectUI} from "../../../components/logic/capabilities-constraint/capabilities-constraint.component";
+import {CapabilityFilterConstraintUI} from "../../../../models/capability-filter-constraint";
+import {OPERATOR_TYPES} from "../../../../utils/filter-constraint-helper";
 
 export class UIDropDownSourceTypesElement extends DropdownValue {
   options: any[];
@@ -53,7 +53,7 @@ export class CapabilitiesFilterPropertiesEditorComponent {
 
   input: {
     serviceRuleIndex: number,
-    serviceRules: CapabilitiesConstraintObjectUI[],
+    serviceRules: CapabilityFilterConstraintUI[],
     compositeServiceName: string,
     currentServiceName: string,
     parentServiceInputs: InputBEModel[],
@@ -66,12 +66,12 @@ export class CapabilitiesFilterPropertiesEditorComponent {
   selectedServiceProperties: PropertyBEModel[];
   operatorTypes: DropdownValue[];
   sourceTypes: UIDropDownSourceTypesElement[] = [];
-  currentRule: CapabilitiesConstraintObjectUI;
+  currentRule: CapabilityFilterConstraintUI;
   currentIndex: number;
   listOfValuesToAssign: DropdownValue[];
   listOfSourceOptions: PropertyBEModel[];
   assignedValueLabel: string;
-  serviceRulesList: CapabilitiesConstraintObjectUI[];
+  serviceRulesList: CapabilityFilterConstraintUI[];
 
   capabilitiesNames: string[];
   selectedPropertiesByCapabilityName: Array<PropertyModel>;
@@ -92,7 +92,7 @@ export class CapabilitiesFilterPropertiesEditorComponent {
     this.serviceRulesList = this.input.serviceRules;
     this.currentRule = this.serviceRulesList && this.input.serviceRuleIndex >= 0 ?
         this.serviceRulesList[this.input.serviceRuleIndex] :
-        new CapabilitiesConstraintObjectUI({
+        new CapabilityFilterConstraintUI({
           capabilityName: this.SOURCE_TYPES.CAPABILITY_NAME.value,
           sourceName: this.SOURCE_TYPES.STATIC.value,
           sourceType: this.SOURCE_TYPES.STATIC.value, value: '',
-- 
cgit 1.2.3-korg