From 86dc4e7f69e6a05277e123391649fa3f4f7b83a5 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Fri, 23 Jun 2023 17:26:51 +0000 Subject: Revert "Provide tosca function capability to complex type fields in composition view" This reverts commit fc3869ca4c430cc29e46bb42125f5672230b83f0. Reason for revert: Looks to be causing an issue with setting node filter using custom tosca function (save button disbaled) Change-Id: I684aae7a23d30ed5a20aa4630cd658997b4628a5 Issue-ID: SDC-4528 Signed-off-by: MichaelMorris --- .../data-type-fields-structure.html | 185 +++++++++------------ .../data-type-fields-structure.less | 12 -- .../data-type-fields-structure.ts | 104 +----------- .../type-list/type-list-directive.html | 5 +- .../type-list/type-list-directive.ts | 60 +++---- .../type-map/type-map-directive.html | 4 +- .../property-types/type-map/type-map-directive.ts | 72 ++++---- catalog-ui/src/app/modules/service-module.ts | 2 - .../tosca-function/tosca-function.component.ts | 14 +- .../tosca-get-function.component.ts | 7 +- 10 files changed, 157 insertions(+), 308 deletions(-) (limited to 'catalog-ui') diff --git a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.html b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.html index afbd520532..78aa7bc7f4 100644 --- a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.html +++ b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.html @@ -30,116 +30,93 @@ -
-
-
- - Value - - {{'TOSCA_FUNCTION_LABEL' | translate}} -
-
-
- - -
-
- +
+ - + +
+
+
+
-
-
- -
-
- -
-
-
- +
+ +
+
+
+ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + data-ng-change="onValueChange(property.name,'boolean')" + data-ng-model="valueObjRef[property.name]" + data-ng-options="option.v as option.n for option in [{ n: '', v: undefined }, { n: 'false', v: false }, { n: 'true', v: true }]"> + -
- - - -
+
+ + +
diff --git a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.less b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.less index de1f423fcb..abca49d7a3 100644 --- a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.less +++ b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.less @@ -92,15 +92,3 @@ } } -.temp-form { - all: unset; - margin-left: 6px !important; -} -.tosca-box { - display: block !important; - all : unset; -} -.tosca-parent { - margin-left: 10px; -} - diff --git a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts index 37ca36a371..30c7b06733 100644 --- a/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts +++ b/catalog-ui/src/app/directives/property-types/data-type-fields-structure/data-type-fields-structure.ts @@ -22,14 +22,11 @@ * Created by obarda on 1/27/2016. */ 'use strict'; -import { DataTypesMap, DerivedFEProperty, PropertyDeclareAPIModel, PropertyModel } from 'app/models'; +import { DataTypesMap, PropertyModel } from 'app/models'; import { DataTypePropertyModel } from 'app/models/data-type-properties'; import { DataTypesService } from 'app/services'; import { ValidationUtils } from 'app/utils'; -import { PropertiesUtils } from "../../../ng2/pages/properties-assignment/services/properties.utils"; -import { InstanceFeDetails } from "app/models/instance-fe-details"; -import { SubPropertyToscaFunction } from 'app/models/sub-property-tosca-function'; -import { ToscaGetFunction } from 'app/models/tosca-get-function'; +import {InstanceFeDetails} from "app/models/instance-fe-details"; import * as _ from 'lodash'; export interface IDataTypeFieldsStructureScope extends ng.IScope { @@ -50,20 +47,12 @@ export interface IDataTypeFieldsStructureScope extends ng.IScope { dataTypesService: DataTypesService; constraints: string[]; isService:boolean; - showToscaFunction: Map; - subpropertyMap: Map; - complexToscapath: string; expandAndCollapse(): void; getValidationPattern(type: string): RegExp; validateIntRange(value: string): boolean; onValueChange(propertyName: string, type: string): void; - inputOnValueChange(property: any, value: any): void; - onEnableTosca(toscaFlag:boolean,propertyName:string); - verifyTosca(propertyName: string) : boolean; - getSubProperty(propertyName: string) : PropertyDeclareAPIModel; - getToscaPathValue(propertyName: string) : Array; - onGetToscaFunction(toscaGetFunction: ToscaGetFunction, propertyName:string); + inputOnValueChange(property: any): void; } export class DataTypeFieldsStructureDirective implements ng.IDirective { @@ -81,8 +70,7 @@ export class DataTypeFieldsStructureDirective implements ng.IDirective { defaultValue: '@', types: '=', expandByDefault: '=', - isService: '=', - complexToscapath: '=' + isService: '=' }; restrict = 'E'; @@ -90,15 +78,13 @@ export class DataTypeFieldsStructureDirective implements ng.IDirective { constructor(private DataTypesService: DataTypesService, private PropertyNameValidationPattern: RegExp, - private ValidationUtils: ValidationUtils, - private PropertiesUtils: PropertiesUtils) { + private ValidationUtils: ValidationUtils) { } public static factory = (DataTypesService: DataTypesService, PropertyNameValidationPattern: RegExp, - ValidationUtils: ValidationUtils, - PropertiesUtils: PropertiesUtils) => { - return new DataTypeFieldsStructureDirective(DataTypesService, PropertyNameValidationPattern, ValidationUtils, PropertiesUtils); + ValidationUtils: ValidationUtils) => { + return new DataTypeFieldsStructureDirective(DataTypesService, PropertyNameValidationPattern, ValidationUtils); } template = (): string => { return require('./data-type-fields-structure.html'); @@ -110,20 +96,7 @@ export class DataTypeFieldsStructureDirective implements ng.IDirective { scope.$watchCollection('[typeName,fieldsPrefixName]', (newData: any): void => { this.rerender(scope); }); - let childProp = this.PropertiesUtils.convertAddPropertyBAToPropertyFE(scope.parentProperty); - scope.subpropertyMap = new Map(); - scope.showToscaFunction = new Map(); - childProp.flattenedChildren.forEach(prop => { - scope.showToscaFunction.set(prop.name,false); - if (scope.parentProperty.subPropertyToscaFunctions != null) { - scope.parentProperty.subPropertyToscaFunctions.forEach(SubPropertyToscaFunction => { - if (SubPropertyToscaFunction.subPropertyPath.toString() == prop.name) { - scope.showToscaFunction.set(prop.name,true); - } - }); - } - scope.subpropertyMap.set(prop.name,new PropertyDeclareAPIModel(childProp, prop)); - }); + scope.expandAndCollapse = (): void => { if (!scope.expanded) { this.initDataOnScope(scope, $attr); @@ -157,65 +130,6 @@ export class DataTypeFieldsStructureDirective implements ng.IDirective { || scope.onValueChange(property.name, (property.simpleType || property.type))); return value; }; - - scope.onEnableTosca = (toscaFlag:boolean,key:string):void => { - scope.showToscaFunction.set(key,toscaFlag); - scope.valueObjRef[key] = ""; - if (!toscaFlag) { - if (scope.parentProperty.subPropertyToscaFunctions != null) { - let subToscaFunctionList : Array = []; - scope.parentProperty.subPropertyToscaFunctions.forEach((SubPropertyToscaFunction, index) => { - if (SubPropertyToscaFunction.subPropertyPath.toString() != key) { - subToscaFunctionList.push(SubPropertyToscaFunction); - } - }); - scope.parentProperty.subPropertyToscaFunctions = subToscaFunctionList; - } - } - }; - - scope.verifyTosca = (propName:string) : boolean => { - return scope.showToscaFunction.get(propName); - } - - scope.getSubProperty = (propertyName: string) : PropertyDeclareAPIModel => { - return scope.subpropertyMap.get(propertyName); - } - - scope.getToscaPathValue = (propertyName: string) : Array => { - const parentObj : PropertyDeclareAPIModel = scope.subpropertyMap.get(propertyName); - if (parentObj.input instanceof DerivedFEProperty) { - return parentObj.input.toscaPath; - } - return [propertyName]; - } - - scope.onGetToscaFunction = (toscaGetFunction: ToscaGetFunction, key:string): void => { - let toscaPath = key; - scope.valueObjRef[key] = ""; - if (scope.parentProperty.subPropertyToscaFunctions != null) { - let toscaFlag : boolean = true - scope.parentProperty.subPropertyToscaFunctions.forEach(SubPropertyToscaFunction => { - if (SubPropertyToscaFunction.subPropertyPath.toString() == toscaPath) { - SubPropertyToscaFunction.toscaFunction = toscaGetFunction; - toscaFlag = false; - return; - } - }); - if (toscaFlag) { - let subPropertyToscaFunction = new SubPropertyToscaFunction(); - subPropertyToscaFunction.toscaFunction = toscaGetFunction; - subPropertyToscaFunction.subPropertyPath = [toscaPath]; - scope.parentProperty.subPropertyToscaFunctions.push(subPropertyToscaFunction); - } - } else { - let subPropertyToscaFunction = new SubPropertyToscaFunction(); - subPropertyToscaFunction.toscaFunction = toscaGetFunction; - subPropertyToscaFunction.subPropertyPath = [toscaPath]; - scope.parentProperty.subPropertyToscaFunctions = [subPropertyToscaFunction]; - } - } - } // public types=Utils.Constants.PROPERTY_DATA.TYPES; @@ -277,4 +191,4 @@ export class DataTypeFieldsStructureDirective implements ng.IDirective { } } -DataTypeFieldsStructureDirective.factory.$inject = ['Sdc.Services.DataTypesService', 'PropertyNameValidationPattern', 'ValidationUtils','PropertiesUtils']; +DataTypeFieldsStructureDirective.factory.$inject = ['Sdc.Services.DataTypesService', 'PropertyNameValidationPattern', 'ValidationUtils']; diff --git a/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.html b/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.html index 109c9a9ec9..1455f2742f 100644 --- a/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.html +++ b/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.html @@ -15,13 +15,12 @@ -->
-
+
@@ -29,7 +28,7 @@
-
+ Value diff --git a/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts b/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts index 18c46b4bac..40a29da5fb 100644 --- a/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts +++ b/catalog-ui/src/app/directives/property-types/type-list/type-list-directive.ts @@ -47,7 +47,6 @@ export interface ITypeListScope extends ng.IScope { constraints:string[]; types:DataTypesMap; isService:boolean; - complexToscapath: string; getValidationPattern(type:string):RegExp; validateIntRange(value:string):boolean; @@ -86,8 +85,7 @@ export class TypeListDirective implements ng.IDirective { maxLength: '=', constraints: '=', types: '=', - isService: '=', - complexToscapath: '=' + isService: '=' }; restrict = 'E'; @@ -125,26 +123,22 @@ export class TypeListDirective implements ng.IDirective { link = (scope:ITypeListScope, element:any, $attr:any) => { scope.propertyNameValidationPattern = this.PropertyNameValidationPattern; scope.stringSchema = this.stringSchema; - if ((scope.valueObjRef == null || scope.valueObjRef.length == 0) && scope.complexToscapath == null) { + if (scope.valueObjRef == null || scope.valueObjRef.length == 0) { scope.valueObjRef = []; scope.valueObjRef.push(""); } - if (scope.valueObjRef != null && scope.valueObjRef.length > 0) { - scope.showToscaFunction = new Array(scope.valueObjRef.length); - scope.valueObjRef.forEach((value, index) => { - scope.showToscaFunction[index] = false; - if (scope.parentProperty.subPropertyToscaFunctions != null) { - let key : string = index.toString(); - scope.parentProperty.subPropertyToscaFunctions.forEach(SubPropertyToscaFunction => { - if (SubPropertyToscaFunction.subPropertyPath.toString() == key) { - scope.showToscaFunction[index] = true; - return; - } - }); - } - }); - } - + scope.showToscaFunction = new Array(scope.valueObjRef.length); + scope.valueObjRef.forEach((value, index) => { + scope.showToscaFunction[index] = false; + let key : string = index.toString(); + if (scope.parentProperty.subPropertyToscaFunctions != null) { + scope.parentProperty.subPropertyToscaFunctions.forEach(SubPropertyToscaFunction => { + if (SubPropertyToscaFunction.subPropertyPath.indexOf(key) != -1) { + scope.showToscaFunction[index] = true; + } + }); + } + }); //reset valueObjRef when schema type is changed scope.$watchCollection('schemaProperty.type', (newData:any):void => { scope.isSchemaTypeDataType = this.DataTypesService.isDataTypeForSchemaType(scope.schemaProperty); @@ -180,7 +174,6 @@ export class TypeListDirective implements ng.IDirective { } } scope.valueObjRef.push(newVal); - scope.showToscaFunction = scope.showToscaFunction || []; scope.showToscaFunction.push(false); scope.listNewItem.value = ""; }; @@ -221,7 +214,7 @@ export class TypeListDirective implements ng.IDirective { if (scope.parentProperty.subPropertyToscaFunctions != null) { let subToscaFunctionList : Array = []; scope.parentProperty.subPropertyToscaFunctions.forEach((SubPropertyToscaFunction, index) => { - if (SubPropertyToscaFunction.subPropertyPath.toString() != key) { + if (SubPropertyToscaFunction.subPropertyPath.indexOf(key) == -1) { subToscaFunctionList.push(SubPropertyToscaFunction); } }); @@ -233,26 +226,21 @@ export class TypeListDirective implements ng.IDirective { scope.onGetToscaFunction = (toscaGetFunction: ToscaGetFunction, index:number): void => { let key:string = index.toString(); if (scope.parentProperty.subPropertyToscaFunctions != null) { - let toscaFlag : boolean = true; scope.parentProperty.subPropertyToscaFunctions.forEach(SubPropertyToscaFunction => { - if (SubPropertyToscaFunction.subPropertyPath.toString() == key) { + if (SubPropertyToscaFunction.subPropertyPath.indexOf(key) != -1) { SubPropertyToscaFunction.toscaFunction = toscaGetFunction; - toscaFlag = false; return; } }); - if (toscaFlag) { - let subPropertyToscaFunction = new SubPropertyToscaFunction(); - subPropertyToscaFunction.toscaFunction = toscaGetFunction; - subPropertyToscaFunction.subPropertyPath = [key]; - scope.parentProperty.subPropertyToscaFunctions.push(subPropertyToscaFunction); - } - } else { - let subPropertyToscaFunction = new SubPropertyToscaFunction(); - subPropertyToscaFunction.toscaFunction = toscaGetFunction; - subPropertyToscaFunction.subPropertyPath = [key]; - scope.parentProperty.subPropertyToscaFunctions = [subPropertyToscaFunction]; + + } + if (scope.parentProperty.subPropertyToscaFunctions == null){ + scope.parentProperty.subPropertyToscaFunctions = []; } + let subPropertyToscaFunction = new SubPropertyToscaFunction(); + subPropertyToscaFunction.toscaFunction = toscaGetFunction; + subPropertyToscaFunction.subPropertyPath = [key]; + scope.parentProperty.subPropertyToscaFunctions.push(subPropertyToscaFunction); } }; diff --git a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html index fad6838d01..f53f5cf205 100644 --- a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html +++ b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html @@ -41,7 +41,7 @@
- + Value @@ -120,7 +120,7 @@
Add
diff --git a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts index 875a49cbd2..098b28936b 100644 --- a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts +++ b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts @@ -49,7 +49,6 @@ export interface ITypeMapScope extends ng.IScope { showToscaFunction: boolean[]; types: DataTypesMap; isService: boolean; - complexToscapath: string; getValidationPattern(type: string): RegExp; validateIntRange(value: string): boolean; @@ -78,8 +77,7 @@ export class TypeMapDirective implements ng.IDirective { showAddBtn: '=?', parentProperty: '=', types: '=', - isService: '=', - complexToscapath: '=' + isService: '=' }; restrict = 'E'; @@ -184,30 +182,26 @@ export class TypeMapDirective implements ng.IDirective { const currentKey = currentKeySet[index]; const existingKeyIndex = currentKeySet.indexOf(newKey); if (existingKeyIndex > -1 && existingKeyIndex != index) { - if (scope.parentFormObj != null) { - scope.parentFormObj[fieldName].$setValidity('keyExist', false); - } + scope.parentFormObj[fieldName].$setValidity('keyExist', false); scope.isMapKeysUnique = false; return; } - if (scope.parentFormObj != null) { - scope.parentFormObj[fieldName].$setValidity('keyExist', true); - if (!scope.parentFormObj[fieldName].$invalid) { - // To preserve the order of the keys, delete each one and recreate - const newObj = {}; - angular.copy(scope.valueObjRef, newObj); - angular.forEach(newObj, function(value: any, key: string) { - delete scope.valueObjRef[key]; - if (key == currentKey) { - scope.valueObjRef[newKey] = value; - } else { - scope.valueObjRef[key] = value; - } - }); - } - } + + scope.parentFormObj[fieldName].$setValidity('keyExist', true); scope.isMapKeysUnique = true; - + if (!scope.parentFormObj[fieldName].$invalid) { + // To preserve the order of the keys, delete each one and recreate + const newObj = {}; + angular.copy(scope.valueObjRef, newObj); + angular.forEach(newObj, function(value: any, key: string) { + delete scope.valueObjRef[key]; + if (key == currentKey) { + scope.valueObjRef[newKey] = value; + } else { + scope.valueObjRef[key] = value; + } + }); + } }; scope.deleteMapItem = (index: number): void => { @@ -239,7 +233,7 @@ export class TypeMapDirective implements ng.IDirective { if (scope.parentProperty.subPropertyToscaFunctions != null) { const subToscaFunctionList: SubPropertyToscaFunction[] = []; scope.parentProperty.subPropertyToscaFunctions.forEach((SubPropertyToscaFunction, index) => { - if (SubPropertyToscaFunction.subPropertyPath.toString() != scope.mapKeys[flagIndex]) { + if (SubPropertyToscaFunction.subPropertyPath.indexOf(scope.mapKeys[flagIndex]) == -1) { subToscaFunctionList.push(SubPropertyToscaFunction); } }); @@ -248,30 +242,24 @@ export class TypeMapDirective implements ng.IDirective { } }; - scope.onGetToscaFunction = (toscaGetFunction: ToscaGetFunction, index:string): void => { - let key:string = index; + scope.onGetToscaFunction = (toscaGetFunction: ToscaGetFunction, key: string): void => { if (scope.parentProperty.subPropertyToscaFunctions != null) { - let toscaFlag : boolean = true; - scope.parentProperty.subPropertyToscaFunctions.forEach(SubPropertyToscaFunction => { - if (SubPropertyToscaFunction.subPropertyPath.toString() == key) { + scope.parentProperty.subPropertyToscaFunctions.forEach((SubPropertyToscaFunction) => { + if (SubPropertyToscaFunction.subPropertyPath.indexOf(key) != -1) { SubPropertyToscaFunction.toscaFunction = toscaGetFunction; - toscaFlag = false; return; } }); - if (toscaFlag) { - let subPropertyToscaFunction = new SubPropertyToscaFunction(); - subPropertyToscaFunction.toscaFunction = toscaGetFunction; - subPropertyToscaFunction.subPropertyPath = [key]; - scope.parentProperty.subPropertyToscaFunctions.push(subPropertyToscaFunction); - } - } else { - let subPropertyToscaFunction = new SubPropertyToscaFunction(); - subPropertyToscaFunction.toscaFunction = toscaGetFunction; - subPropertyToscaFunction.subPropertyPath = [key]; - scope.parentProperty.subPropertyToscaFunctions = [subPropertyToscaFunction]; + } - } + if (scope.parentProperty.subPropertyToscaFunctions == null) { + scope.parentProperty.subPropertyToscaFunctions = []; + } + const subPropertyToscaFunction = new SubPropertyToscaFunction(); + subPropertyToscaFunction.toscaFunction = toscaGetFunction; + subPropertyToscaFunction.subPropertyPath = [key]; + scope.parentProperty.subPropertyToscaFunctions.push(subPropertyToscaFunction); + }; scope.addMapItemFields = (): void => { if (!scope.valueObjRef) { diff --git a/catalog-ui/src/app/modules/service-module.ts b/catalog-ui/src/app/modules/service-module.ts index 1450b7f4cb..b9191cc6d1 100644 --- a/catalog-ui/src/app/modules/service-module.ts +++ b/catalog-ui/src/app/modules/service-module.ts @@ -71,7 +71,6 @@ import { FileUtils } from '../utils/file-utils'; import { ValidationUtils } from '../utils/validation-utils'; import {ReqAndCapabilitiesService} from "../ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service"; import {ToscaArtifactService} from "../ng2/services/tosca-artifact.service"; -import { PropertiesUtils } from 'app/ng2/pages/properties-assignment/services/properties.utils'; const moduleName: string = 'Sdc.Services'; const serviceModule: ng.IModule = angular.module(moduleName, []); @@ -134,4 +133,3 @@ serviceModule.service('ElementService', downgradeInjectable(ElementService)); serviceModule.service('ModelService', downgradeInjectable(ModelService)); serviceModule.service('ImportVSPService', downgradeInjectable(ImportVSPService)); serviceModule.service('ToscaArtifactService', downgradeInjectable(ToscaArtifactService)); -serviceModule.service('PropertiesUtils', downgradeInjectable(PropertiesUtils)); diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.component.ts index 792d9cba60..34ed9a618d 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.component.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.component.ts @@ -82,6 +82,7 @@ export class ToscaFunctionComponent implements OnInit, OnChanges { if (!this.isInitialized) { return; } + this.emitValidityChange(); if (this.formGroup.valid) { this.onValidFunction.emit(this.toscaFunctionForm.value); } @@ -110,12 +111,12 @@ export class ToscaFunctionComponent implements OnInit, OnChanges { let keyToFind = [this.compositionMapKey]; let subPropertyToscaFunction = this.property.subPropertyToscaFunctions.find(subPropertyToscaFunction => this.areEqual(subPropertyToscaFunction.subPropertyPath, keyToFind)); - if (subPropertyToscaFunction){ - this.toscaFunction = subPropertyToscaFunction.toscaFunction; - this.toscaFunctionForm.setValue(this.toscaFunction); - this.toscaFunctionTypeForm.setValue(this.toscaFunction.type); - } - return; + if (subPropertyToscaFunction){ + this.toscaFunction = subPropertyToscaFunction.toscaFunction; + this.toscaFunctionForm.setValue(this.toscaFunction); + this.toscaFunctionTypeForm.setValue(this.toscaFunction.type); + } + return; } if (this.property instanceof PropertyDeclareAPIModel && this.property.subPropertyToscaFunctions && ( this.property).propertiesName){ let propertiesPath = ( this.property).propertiesName.split("#"); @@ -266,7 +267,6 @@ export class ToscaFunctionComponent implements OnInit, OnChanges { } else { this.toscaFunctionForm.setValue(undefined); } - this.emitValidityChange(); } onYamlFunctionValidityChange(validationEvent: YamlFunctionValidationEvent): void { diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts index 1fe467736d..a1ed8aa137 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts @@ -486,7 +486,7 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { if (this.typeHasSchema(this.property.type)) { if ((this.property instanceof PropertyDeclareAPIModel && ( this.property).input instanceof DerivedFEProperty) || this.compositionMap) { let childObject : DerivedFEProperty = (( this.property).input); - let childSchemaType = (this.property != null && this.property.schemaType != null) ? this.property.schemaType : childObject.type; + let childSchemaType = this.property.schemaType != null ? this.property.schemaType : childObject.type; if(this.isComplexType(childSchemaType) && !this.compositionMap){ if (childObject.type == PROPERTY_TYPES.MAP && childObject.isChildOfListOrMap) { return validPropertyType === PROPERTY_TYPES.STRING; @@ -501,15 +501,12 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { } return validPropertyType === this.property.type && this.property.schema.property.type === property.schema.property.type; } - if ((this.property.schema.property.isDataType || this.isComplexType(this.property.type)) && this.property instanceof PropertyDeclareAPIModel && (this.property).propertiesName){ + if (this.property.schema.property.isDataType && this.property instanceof PropertyDeclareAPIModel && (this.property).propertiesName){ let typeToMatch = ( this.property).input.type; let childObject : DerivedFEProperty = (( this.property).input); if (childObject.type == PROPERTY_TYPES.MAP && childObject.isChildOfListOrMap) { typeToMatch = PROPERTY_TYPES.STRING; } - if ((typeToMatch === PROPERTY_TYPES.LIST || typeToMatch === PROPERTY_TYPES.MAP) && ( this.property).input.schema.property.type && this.compositionMap && !isNaN(Number(this.compositionMapKey))) { - typeToMatch = ( this.property).input.schema.property.type; - } return validPropertyType === typeToMatch; } -- cgit 1.2.3-korg