summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/utils
diff options
context:
space:
mode:
authorfranciscovila <javier.paradela.vila@est.tech>2023-06-20 10:38:45 +0100
committerMichael Morris <michael.morris@est.tech>2023-06-23 18:55:13 +0000
commitdf1d6ebebe45708040048abc33aebb8980a0c9f2 (patch)
tree38b49640c955eb0e36878145b0568d60f6c46bb2 /catalog-ui/src/app/utils
parentdfcf12ff9461b8c508d5932cf210e9a8203e7ea1 (diff)
Support custom tosca functions in operation input values1.13.1
Issue-ID: SDC-4545 Signed-off-by: franciscovila <javier.paradela.vila@est.tech> Change-Id: Icd466d4e2e1d2136f6e41b5c345e9244d5f295f6
Diffstat (limited to 'catalog-ui/src/app/utils')
-rw-r--r--catalog-ui/src/app/utils/filter-constraint-helper.ts4
-rw-r--r--catalog-ui/src/app/utils/tosca-function-helper.ts3
2 files changed, 6 insertions, 1 deletions
diff --git a/catalog-ui/src/app/utils/filter-constraint-helper.ts b/catalog-ui/src/app/utils/filter-constraint-helper.ts
index 7ee9d27efe..2666bbfd81 100644
--- a/catalog-ui/src/app/utils/filter-constraint-helper.ts
+++ b/catalog-ui/src/app/utils/filter-constraint-helper.ts
@@ -27,9 +27,11 @@ export class FilterConstraintHelper {
public static buildFilterConstraintLabel(constraint: FilterConstraint): string {
let value;
if (ToscaFunctionHelper.isValueToscaFunction(constraint.value)) {
+ console.error(constraint.value);
const toscaFunction = ToscaFunctionHelper.convertObjectToToscaFunction(constraint.value);
if (toscaFunction) {
- value = toscaFunction.buildValueString();
+ value = toscaFunction.value;
+ console.error(value);
} else {
value = JSON.stringify(constraint.value, null, 4);
}
diff --git a/catalog-ui/src/app/utils/tosca-function-helper.ts b/catalog-ui/src/app/utils/tosca-function-helper.ts
index 714f22ef57..7cef768770 100644
--- a/catalog-ui/src/app/utils/tosca-function-helper.ts
+++ b/catalog-ui/src/app/utils/tosca-function-helper.ts
@@ -24,6 +24,7 @@ import {ToscaConcatFunction} from "../models/tosca-concat-function";
import {ToscaGetFunction} from "../models/tosca-get-function";
import {YamlFunction} from "../models/yaml-function";
import {ToscaFunction} from "../models/tosca-function";
+import {ToscaCustomFunction} from "../models/tosca-custom-function";
export class ToscaFunctionHelper {
@@ -41,6 +42,8 @@ export class ToscaFunctionHelper {
return new ToscaGetFunction(value);
case ToscaFunctionType.YAML:
return new YamlFunction(value);
+ case ToscaFunctionType.CUSTOM:
+ return new ToscaCustomFunction(value);
case ToscaFunctionType.STRING:
return <ToscaFunction> {
type: ToscaFunctionType.STRING,