From 7ce54a98719426a32e041e5bf30c950a4b226734 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Thu, 21 Apr 2022 16:27:59 +0100 Subject: [PATCH] Add <= and >= operators to node filter Signed-off-by: MichaelMorris Issue-ID: SDC-3979 Change-Id: I2814157e8fafd02c094afd8270a20c0e47687b18 --- .../openecomp/sdc/be/datamodel/utils/ConstraintConvertor.java | 4 +++- .../service-dependencies/service-dependencies.component.ts | 10 ++++++++-- catalog-ui/src/assets/styles/form-elements.less | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ConstraintConvertor.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ConstraintConvertor.java index 877f8c4093..0fcbdd7768 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ConstraintConvertor.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ConstraintConvertor.java @@ -39,12 +39,14 @@ public class ConstraintConvertor { public static final String EQUAL_OPERATOR = ConstraintType.EQUAL.getTypes().get(1); public static final String GREATER_THAN_OPERATOR = ConstraintType.GREATER_THAN.getTypes().get(1); public static final String LESS_THAN_OPERATOR = ConstraintType.LESS_THAN.getTypes().get(1); + public static final String GREATER_OR_EQUAL_OPERATOR = ConstraintType.GREATER_OR_EQUAL.getTypes().get(1); + public static final String LESS_OR_EQUAL_OPERATOR = ConstraintType.LESS_OR_EQUAL.getTypes().get(1); public static final String STATIC_CONSTRAINT = "static"; public static final String PROPERTY_CONSTRAINT = "property"; public static final String SERVICE_INPUT_CONSTRAINT = "service_input"; public static final String SELF = "SELF"; private static final Logger logger = LoggerFactory.getLogger(ConstraintConvertor.class); - private static Set SUPPORTED_CONSTRAINT_LIST = ImmutableSet.of(EQUAL_OPERATOR, GREATER_THAN_OPERATOR, LESS_THAN_OPERATOR); + private static Set SUPPORTED_CONSTRAINT_LIST = ImmutableSet.of(EQUAL_OPERATOR, GREATER_THAN_OPERATOR, LESS_THAN_OPERATOR, GREATER_OR_EQUAL_OPERATOR, LESS_OR_EQUAL_OPERATOR); private static Set SUPPORTED_FUNCTIONS = ImmutableSet .of(ToscaFunctions.GET_INPUT.getFunctionName(), ToscaFunctions.GET_PROPERTY.getFunctionName()); 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 cdb1cd84e5..4d695593ec 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 @@ -77,7 +77,9 @@ export class ConstraintObjectUI extends ConstraintObject{ export const OPERATOR_TYPES = { EQUAL: 'equal', GREATER_THAN: 'greater_than', - LESS_THAN: 'less_than' + LESS_THAN: 'less_than', + GREATER_OR_EQUAL: 'greater_or_equal', + LESS_OR_EQUAL: 'less_or_equal' }; // tslint:disable-next-line:max-classes-per-file @@ -165,7 +167,9 @@ export class ServiceDependenciesComponent { this.operatorTypes = [ {label: '>', value: OPERATOR_TYPES.GREATER_THAN}, {label: '<', value: OPERATOR_TYPES.LESS_THAN}, - {label: '=', value: OPERATOR_TYPES.EQUAL} + {label: '=', value: OPERATOR_TYPES.EQUAL}, + {label: '>=', value: OPERATOR_TYPES.GREATER_OR_EQUAL}, + {label: '<=', value: OPERATOR_TYPES.LESS_OR_EQUAL} ]; this.topologyTemplateService.getComponentInputsWithProperties(this.compositeService.componentType, this.compositeService.uniqueId) .subscribe((result: ComponentGenericResponse) => { @@ -457,6 +461,8 @@ export class ServiceDependenciesComponent { case OPERATOR_TYPES.LESS_THAN: return '<'; case OPERATOR_TYPES.EQUAL: return '='; case OPERATOR_TYPES.GREATER_THAN: return '>'; + case OPERATOR_TYPES.GREATER_OR_EQUAL: return '>='; + case OPERATOR_TYPES.LESS_OR_EQUAL: return '<='; } } diff --git a/catalog-ui/src/assets/styles/form-elements.less b/catalog-ui/src/assets/styles/form-elements.less index 9f8146d3f5..aca7ef9f89 100644 --- a/catalog-ui/src/assets/styles/form-elements.less +++ b/catalog-ui/src/assets/styles/form-elements.less @@ -106,7 +106,7 @@ input[type="url"], input[type="number"], input[type="password"] { padding: 4px 10px;} - select { padding: 4px 7px;} + select { padding: 4px 0px;} textarea { padding: 6px 10px;} select { -- 2.16.6