diff options
Diffstat (limited to 'catalog-ui/src')
4 files changed, 63 insertions, 16 deletions
diff --git a/catalog-ui/src/app/models/tosca-get-function.ts b/catalog-ui/src/app/models/tosca-get-function.ts index 7e6c5ad739..3bb207700b 100644 --- a/catalog-ui/src/app/models/tosca-get-function.ts +++ b/catalog-ui/src/app/models/tosca-get-function.ts @@ -34,7 +34,8 @@ export class ToscaGetFunction implements ToscaFunction, ToscaFunctionParameter { sourceName: string; functionType: ToscaGetFunctionType; propertyPathFromSource: Array<string>; - value: any + value: any; + toscaIndex: string; constructor(toscaGetFunction?: ToscaGetFunction) { if (!toscaGetFunction) { @@ -48,6 +49,7 @@ export class ToscaGetFunction implements ToscaFunction, ToscaFunctionParameter { this.sourceUniqueId = toscaGetFunction.sourceUniqueId; this.sourceName = toscaGetFunction.sourceName; this.functionType = toscaGetFunction.functionType; + this.toscaIndex = toscaGetFunction.toscaIndex; if (toscaGetFunction.propertyPathFromSource) { this.propertyPathFromSource = [...toscaGetFunction.propertyPathFromSource]; } @@ -69,20 +71,20 @@ export class ToscaGetFunction implements ToscaFunction, ToscaFunctionParameter { private buildGetInputFunctionValue(): Object { if (this.propertyPathFromSource.length === 1) { - return {[this.functionType.toLowerCase()]: this.propertyPathFromSource[0]}; + return {[this.functionType.toLowerCase()]: [this.propertyPathFromSource[0], this.toscaIndex]}; } - return {[this.functionType.toLowerCase()]: this.propertyPathFromSource}; + return {[this.functionType.toLowerCase()]: [this.propertyPathFromSource, this.toscaIndex]}; } private buildFunctionValueWithPropertySource(): Object { if (this.propertySource == PropertySource.SELF) { return { - [this.functionType.toLowerCase()]: [PropertySource.SELF, ...this.propertyPathFromSource] + [this.functionType.toLowerCase()]: [PropertySource.SELF, ...this.propertyPathFromSource, this.toscaIndex] }; } if (this.propertySource == PropertySource.INSTANCE) { return { - [this.functionType.toLowerCase()]: [this.sourceName, ...this.propertyPathFromSource] + [this.functionType.toLowerCase()]: [this.sourceName, ...this.propertyPathFromSource,this.toscaIndex] }; } } diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.html b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.html index 62cd697f8c..387bb5cbcb 100644 --- a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.html +++ b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.html @@ -28,9 +28,11 @@ </div> <div *ngIf="showPropertyDropdown()" class="i-sdc-form-item"> <label class="i-sdc-form-label required">{{dropdownValuesLabel}}</label> - <select formControlName="selectedProperty"> + <select formControlName="selectedProperty" (change)="onPropertyValueChange()"> <option *ngFor="let value of propertyDropdownList" [ngValue]="value">{{value.propertyLabel}}</option> </select> + <label class="i-sdc-form-label required" *ngIf="toscaIndexFlag">Index</label> + <input type="text" *ngIf="toscaIndexFlag" formControlName="toscaIndex" (change)="indexTokenChange()"/> </div> <div *ngIf="dropDownErrorMsg" class="tosca-error">{{dropDownErrorMsg}}</div> </form> 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 36ead13117..fe6f2f143c 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 @@ -52,7 +52,8 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { formGroup: FormGroup = new FormGroup({ 'selectedProperty': new FormControl(undefined, Validators.required), - 'propertySource': new FormControl(undefined, Validators.required) + 'propertySource': new FormControl(undefined, Validators.required), + 'toscaIndex' : new FormControl(undefined) }); isLoading: boolean = false; @@ -61,6 +62,7 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { instanceNameAndIdMap: Map<string, string> = new Map<string, string>(); dropdownValuesLabel: string; dropDownErrorMsg: string; + toscaIndexFlag: boolean = false; private isInitialized: boolean = false; private componentMetadata: ComponentMetadata; @@ -78,8 +80,14 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { if (!this.isInitialized) { return; } + let formGroupStatus : boolean = this.formGroup.valid; + const selectedProperty: PropertyDropdownValue = this.formGroup.value.selectedProperty; + if (selectedProperty != null && selectedProperty.isList && formGroupStatus + && (this.toscaIndex.value == null || this.toscaIndex.value == '')) { + formGroupStatus = false; + } this.onValidityChange.emit({ - isValid: this.formGroup.valid, + isValid: formGroupStatus, toscaGetFunction: this.formGroup.valid ? this.buildGetFunctionFromForm() : undefined }); if (this.formGroup.valid) { @@ -132,6 +140,10 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { } else { subscriber.next(); } + if (this.toscaGetFunction.toscaIndex != null) { + this.toscaIndexFlag = true; + this.toscaIndex.setValue(this.toscaGetFunction.toscaIndex); + } }); } @@ -154,6 +166,7 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { toscaGetFunction.propertyUniqueId = selectedProperty.propertyId; toscaGetFunction.propertyName = selectedProperty.propertyName; toscaGetFunction.propertyPathFromSource = selectedProperty.propertyPath; + toscaGetFunction.toscaIndex = this.toscaIndex.value; return toscaGetFunction; } @@ -219,6 +232,7 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { private resetPropertyDropdown(): void { this.dropDownErrorMsg = undefined; this.selectedProperty.reset(); + this.toscaIndex.reset(); this.propertyDropdownList = []; } @@ -357,7 +371,8 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { propertyName: property.name, propertyId: property.uniqueId, propertyLabel: property.name, - propertyPath: [property.name] + propertyPath: [property.name], + isList: property.type === PROPERTY_TYPES.LIST }); } else if (this.isComplexType(property.type)) { this.fillPropertyDropdownWithMatchingChildProperties(property); @@ -378,7 +393,8 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { propertyName: dataTypeProperty.name, propertyId: parentPropertyList[0].uniqueId, propertyLabel: parentPropertyList.map(property => property.name).join('->') + '->' + dataTypeProperty.name, - propertyPath: [...parentPropertyList.map(property => property.name), dataTypeProperty.name] + propertyPath: [...parentPropertyList.map(property => property.name), dataTypeProperty.name], + isList : dataTypeProperty.type === PROPERTY_TYPES.LIST }); } else if (this.isComplexType(dataTypeProperty.type)) { this.fillPropertyDropdownWithMatchingChildProperties(dataTypeProperty, [...parentPropertyList]) @@ -390,23 +406,24 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { if (this.property.type === PROPERTY_TYPES.ANY) { return true; } + let validPropertyType = property.type === PROPERTY_TYPES.LIST ? property.schemaType : property.type; if (this.typeHasSchema(this.property.type)) { if ((this.property instanceof PropertyDeclareAPIModel && (<PropertyDeclareAPIModel> this.property).input instanceof DerivedFEProperty) || this.compositionMap) { let childObject : DerivedFEProperty = (<DerivedFEProperty>(<PropertyDeclareAPIModel> this.property).input); 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 property.type === PROPERTY_TYPES.STRING; + return validPropertyType === PROPERTY_TYPES.STRING; } - return property.type === childObject.type; + return validPropertyType === childObject.type; }else{ - return property.type === this.property.schema.property.type; + return validPropertyType === this.property.schema.property.type; } } if (!property.schema || !property.schema.property) { return false; } - return property.type === this.property.type && this.property.schema.property.type === property.schema.property.type; + return validPropertyType === this.property.type && this.property.schema.property.type === property.schema.property.type; } if (this.property.schema.property.isDataType && this.property instanceof PropertyDeclareAPIModel && (<PropertyDeclareAPIModel>this.property).propertiesName){ let typeToMatch = (<PropertyDeclareAPIModel> this.property).input.type; @@ -414,10 +431,10 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { if (childObject.type == PROPERTY_TYPES.MAP && childObject.isChildOfListOrMap) { typeToMatch = PROPERTY_TYPES.STRING; } - return property.type === typeToMatch; + return validPropertyType === typeToMatch; } - return property.type === this.property.type; + return validPropertyType === this.property.type; } private getType(propertyPath:string[], type: string): string { @@ -467,12 +484,32 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { onPropertySourceChange(): void { this.selectedProperty.reset(); + this.toscaIndex.reset(); if (!this.functionType || !this.propertySource.valid) { return; } this.loadPropertyDropdown(); } + onPropertyValueChange(): void { + this.toscaIndexFlag = false; + this.toscaIndex.reset(); + const selectedProperty: PropertyDropdownValue = this.selectedProperty.value; + if (selectedProperty.isList) { + this.toscaIndexFlag = true; + } + } + + indexTokenChange(): void { + if ((this.toscaIndex.value).toLowerCase() === 'index') { + return; + } + let indexTokenValue = Number(this.toscaIndex.value); + if (isNaN(indexTokenValue)) { + this.toscaIndex.reset(); + } + } + showPropertySourceDropdown(): boolean { return this.isGetProperty() || this.isGetAttribute(); } @@ -489,6 +526,10 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges { return this.formGroup.get('selectedProperty') as FormControl; } + private get toscaIndex(): FormControl { + return this.formGroup.get('toscaIndex') as FormControl; + } + } export interface PropertyDropdownValue { @@ -496,6 +537,7 @@ export interface PropertyDropdownValue { propertyId: string; propertyLabel: string; propertyPath: Array<string>; + isList: boolean; } export interface ToscaGetFunctionValidationEvent { diff --git a/catalog-ui/src/assets/languages/en_US.json b/catalog-ui/src/assets/languages/en_US.json index 18813280d6..ff90fb854e 100644 --- a/catalog-ui/src/assets/languages/en_US.json +++ b/catalog-ui/src/assets/languages/en_US.json @@ -523,6 +523,7 @@ "=========== PROPERTIES ASSIGNMENT TOSCA FUNCTION BUTTON ===========": "", "TOSCA_FUNCTION_LABEL": "TOSCA function", "TOSCA_FUNCTION_PROPERTY_SOURCE_LABEL": "Property Source", + "TOSCA_FUNCTION_PROPERTY_INDEX": "Index", "TOSCA_FUNCTION_CLEAR_VALUE_BUTTON": "Clear Value", "TOSCA_FUNCTION_MODAL_TITLE": "Set value using TOSCA functions", "INPUT_DROPDOWN_LABEL": "Input", |