import {ArtifactModel} from "./artifacts";
import {SchemaPropertyGroupModel} from "./schema-property";
import {PROPERTY_DATA, PROPERTY_TYPES} from "../utils/constants";
+import {ToscaFunction} from "./tosca-function";
export class InputOperationParameter {
name: string;
inputId: string;
toscaDefaultValue?: string;
value?: any;
+ toscaFunction?: ToscaFunction;
+ valid:boolean= true;
constructor(param?: any) {
if (param) {
this.inputId = param.inputId;
this.toscaDefaultValue = param.toscaDefaultValue;
this.value = param.value;
+ this.toscaFunction = param.toscaFunction;
+ this.valid = param.valid;
}
}
private isTypeNotSimple() {
return PROPERTY_DATA.SIMPLE_TYPES.indexOf(this.type) == -1;
}
+
+ public isToscaFunction(): boolean {
+ return this.toscaFunction != null;
+ }
}
export class PropertyOperationParameter {
} from '../../../services/component-services/topology-template.service';
import {TranslateService} from "../../../shared/translator/translate.service";
import {ModalService} from 'app/ng2/services/modal.service';
+import {CompositionService} from "app/ng2/pages/composition/composition.service";
import {ModalComponent} from 'app/ng2/components/ui/modal/modal.component';
import {Component as TopologyTemplate} from "../../../../models/components/component";
import {PluginsService} from "app/ng2/services/plugins.service";
import {SelectedComponentType} from "../common/store/graph.actions";
-
+import {InstanceFeDetails} from "../../../../models/instance-fe-details";
import {WorkspaceService} from "../../workspace/workspace.service";
import {
ComponentInterfaceDefinitionModel,
deploymentArtifactsFilePath: Array<DropdownValue> = [];
toscaArtifactTypes: Array<DropdownValue> = [];
+ componentInstanceMap: Map<string, InstanceFeDetails> = new Map<string, InstanceFeDetails>();
+ validImplementationProps: boolean = true;
@Input() component: ComponentInstance;
@Input() isViewOnly: boolean;
private topologyTemplateService: TopologyTemplateService,
private toscaArtifactService: ToscaArtifactService,
private modalServiceNg2: ModalService,
+ private compositionService: CompositionService,
private workspaceService: WorkspaceService,
@Inject("Notification") private Notification: any,
) {
let enableAddArtifactImplementation = this.modalInstance.instance.dynamicContent.instance.enableAddArtifactImplementation;
if(enableAddArtifactImplementation) {
- let toscaArtifactTypeSelected = this.modalInstance.instance.dynamicContent.instance.toscaArtifactTypeSelected;
- let isToscaArtifactType:boolean = !(typeof toscaArtifactTypeSelected == 'undefined' || _.isEmpty(toscaArtifactTypeSelected));
- disable = !isToscaArtifactType;
+ const validImplementationProps = this.modalInstance.instance.dynamicContent.instance.validImplementationProps;
+ const toscaArtifactTypeSelected = this.modalInstance.instance.dynamicContent.instance.toscaArtifactTypeSelected;
+ const isToscaArtifactType:boolean = !(typeof toscaArtifactTypeSelected == 'undefined' || _.isEmpty(toscaArtifactTypeSelected));
+ disable = !isToscaArtifactType || !validImplementationProps;
return disable;
}
disable = false;
const modalModel: ModalModel = new ModalModel('l', this.modalTranslation.EDIT_TITLE, '', buttonList, 'custom');
this.modalInstance = this.modalServiceNg2.createCustomModal(modalModel);
+ const componentInstances = this.compositionService.getComponentInstances()
+ if (componentInstances) {
+ componentInstances.forEach(value => {
+ this.componentInstanceMap.set(value.uniqueId, <InstanceFeDetails>{
+ name: value.name
+ });
+ });
+ }
+
this.modalServiceNg2.addDynamicContentToModal(
this.modalInstance,
InterfaceOperationHandlerComponent,
{
deploymentArtifactsFilePath: this.deploymentArtifactsFilePath,
+ componentInstanceMap: this.componentInstanceMap,
toscaArtifactTypes: this.toscaArtifactTypes,
selectedInterface: interfaceModel ? interfaceModel : new UIInterfaceModel(),
selectedInterfaceOperation: operation ? operation : new InterfaceOperationModel(),
validityChangedCallback: this.disableSaveButton,
isViewOnly: this.isViewOnly,
+ validImplementationProps: this.validImplementationProps,
isEdit: true,
modelName: this.componentMetaData.model
}
<span class="sprite-new delete-btn" *ngIf="showInputDelete()" (click)="onInputDelete()"></span>
<span class="sprite-new delete-btn" *ngIf="showListItemDelete()" (click)="onChildListItemDelete()"></span>
</span>
- <ng-container *ngIf="isTypeSimple(type.name)">
- <ul *ngIf="isExpanded">
- <li class="input-value">
- <ng-container *ngIf="isViewOnly">
- {{valueObjRef}}<em class="empty-value" *ngIf="valueObjRef !== false && !valueObjRef">empty</em>
- </ng-container>
- <input *ngIf="!isViewOnly" [type]="getSimpleValueInputType()" name="value"
- [(ngModel)]="valueObjRef"
- (ngModelChange)="onValueChange($event)"
- />
- </li>
- </ul>
+
+ <ng-container *ngIf="isExpanded && showToscaFunctionOption">
+ <form>
+ <fieldset [disabled]="isViewOnly" >
+ <input type="radio" name="hasGetFunctionValue"
+ [(ngModel)]="isToscaFunction"
+ [value]="false"
+ (change)="onValueTypeChange()"/> Value
+ <input type="radio" name="hasGetFunctionValue"
+ [(ngModel)]="isToscaFunction"
+ [value]="true"/> {{'TOSCA_FUNCTION_LABEL' | translate}}
+ </fieldset>
+ </form>
+ <div *ngIf="isToscaFunction">
+ <ul>
+ <li>
+ <div *ngIf="componentInstanceMap">
+ <tosca-function
+ [property]="property"
+ [allowClear]="false"
+ [componentInstanceMap]="componentInstanceMap"
+ (onValidityChange)="onToscaFunctionValidityChange($event)">
+ </tosca-function>
+ </div>
+ <div *ngIf="!componentInstanceMap">
+ <tosca-function
+ [property]="property"
+ [allowClear]="false"
+ (onValidityChange)="onToscaFunctionValidityChange($event)">
+ </tosca-function>
+ </div>
+ </li>
+ </ul>
+ </div>
</ng-container>
- <ng-container *ngIf="isTypeComplex(type.name)" >
+
+ <div *ngIf="!isToscaFunction">
+ <ng-container *ngIf="isTypeSimple(type.name)">
<ul *ngIf="isExpanded">
- <ng-container *ngFor="let property of this.type.properties">
- <app-input-list-item
- [name]="property.name"
- [type]="getDataType(property.type)"
+ <li class="input-value">
+ <ng-container *ngIf="isViewOnly">
+ {{valueObjRef}}<em class="empty-value" *ngIf="valueObjRef !== false && !valueObjRef">empty</em>
+ </ng-container>
+ <input *ngIf="!isViewOnly" [type]="getSimpleValueInputType()" name="value"
+ [(ngModel)]="valueObjRef"
+ (ngModelChange)="onValueChange($event)"
+ />
+ </li>
+ </ul>
+ </ng-container>
+ <ng-container *ngIf="isTypeComplex(type.name)" >
+ <ul *ngIf="isExpanded">
+ <ng-container *ngFor="let property of this.type.properties">
+ <app-input-list-item
+ [name]="property.name"
+ [type]="getDataType(property.type)"
+ [dataTypeMap]="dataTypeMap"
+ [valueObjRef]="valueObjRef[property.name]"
+ [schema]="property.schema"
+ [nestingLevel]="nestingLevel + 1"
+ [isViewOnly]="isViewOnly"
+ [showToscaFunctionOption]="showToscaFunctionOption"
+ [allowDeletion]="allowDeletion"
+ (onValueChange)="onPropertyValueChange($event)">
+ </app-input-list-item>
+ </ng-container>
+ </ul>
+ </ng-container>
+ <ng-container *ngIf="isTypeList(type.name)">
+ <ul *ngIf="isExpanded">
+ <ng-container *ngFor="let value1 of valueObjRef; index as i; trackBy: trackByIndex">
+ <li class="input-value" *ngIf="isTypeSimple(schema.property.type)">
+ <ng-container *ngIf="isViewOnly">
+ {{valueObjRef[i]}}
+ </ng-container>
+ <input type="text" *ngIf="!isViewOnly"
+ [(ngModel)]="valueObjRef[i]" (ngModelChange)="onListValueChange()" />
+ <span class="sprite-new delete-btn" *ngIf="!isViewOnly" (click)="onListItemDelete(i)"></span>
+ </li>
+ <app-input-list-item *ngIf="!isTypeSimple(schema.property.type)"
+ [name]="i+''"
+ [type]="getDataType(schema.property.type)"
[dataTypeMap]="dataTypeMap"
- [valueObjRef]="valueObjRef[property.name]"
- [schema]="property.schema"
+ [valueObjRef]="valueObjRef[i]"
+ [schema]="schema"
[nestingLevel]="nestingLevel + 1"
+ [listIndex]="i"
+ [isListChild]="true"
[isViewOnly]="isViewOnly"
[allowDeletion]="allowDeletion"
- (onValueChange)="onPropertyValueChange($event)">
+ (onValueChange)="onPropertyValueChange($event)"
+ (onChildListItemDelete)="onListItemDelete($event)">
</app-input-list-item>
</ng-container>
- </ul>
- </ng-container>
- <ng-container *ngIf="isTypeList(type.name)">
- <ul *ngIf="isExpanded">
- <ng-container *ngFor="let value1 of valueObjRef; index as i; trackBy: trackByIndex">
- <li class="input-value" *ngIf="isTypeSimple(schema.property.type)">
- <ng-container *ngIf="isViewOnly">
- {{valueObjRef[i]}}
- </ng-container>
- <input type="text" *ngIf="!isViewOnly"
- [(ngModel)]="valueObjRef[i]" (ngModelChange)="onListValueChange()" />
- <span class="sprite-new delete-btn" *ngIf="!isViewOnly" (click)="onListItemDelete(i)"></span>
+ <li class="input-value" *ngIf="!isViewOnly">
+ <a class="add-btn" (click)="addListElement()">{{'INPUT_LIST_ADD_LIST_ENTRY' | translate}}</a>
</li>
- <app-input-list-item *ngIf="!isTypeSimple(schema.property.type)"
- [name]="i+''"
- [type]="getDataType(schema.property.type)"
- [dataTypeMap]="dataTypeMap"
- [valueObjRef]="valueObjRef[i]"
- [schema]="schema"
- [nestingLevel]="nestingLevel + 1"
- [listIndex]="i"
- [isListChild]="true"
- [isViewOnly]="isViewOnly"
- [allowDeletion]="allowDeletion"
- (onValueChange)="onPropertyValueChange($event)"
- (onChildListItemDelete)="onListItemDelete($event)">
- </app-input-list-item>
- </ng-container>
- <li class="input-value" *ngIf="!isViewOnly">
- <a class="add-btn" (click)="addListElement()">{{'INPUT_LIST_ADD_LIST_ENTRY' | translate}}</a>
- </li>
- </ul>
- </ng-container>
- <ng-container *ngIf="isTypeMap(type.name)">
- <ul *ngIf="isExpanded">
- <ng-container *ngFor="let key of getObjectEntries(valueObjRef); index as i">
- <li class="input-value" *ngIf="isTypeSimple(schema.property.type)">
- <label class="input-label">{{key}}:</label>
- <ng-container *ngIf="isViewOnly">
- {{valueObjRef[key]}}
- </ng-container>
- <input type="text" *ngIf="!isViewOnly" [(ngModel)]="valueObjRef[key]" (ngModelChange)="onMapValueChange()"/>
- <span class="sprite-new delete-btn" *ngIf="!isViewOnly" (click)="onMapKeyDelete(key)"></span>
+ </ul>
+ </ng-container>
+ <ng-container *ngIf="isTypeMap(type.name)">
+ <ul *ngIf="isExpanded">
+ <ng-container *ngFor="let key of getObjectEntries(valueObjRef); index as i">
+ <li class="input-value" *ngIf="isTypeSimple(schema.property.type)">
+ <label class="input-label">{{key}}:</label>
+ <ng-container *ngIf="isViewOnly">
+ {{valueObjRef[key]}}
+ </ng-container>
+ <input type="text" *ngIf="!isViewOnly" [(ngModel)]="valueObjRef[key]" (ngModelChange)="onMapValueChange()"/>
+ <span class="sprite-new delete-btn" *ngIf="!isViewOnly" (click)="onMapKeyDelete(key)"></span>
+ </li>
+ <app-input-list-item
+ *ngIf="!isTypeSimple(schema.property.type)"
+ [name]="key"
+ [type]="getDataType(schema.property.type)"
+ [dataTypeMap]="dataTypeMap"
+ [valueObjRef]="valueObjRef[key]"
+ [schema]="schema"
+ [isMapChild]="true"
+ [nestingLevel]="nestingLevel + 1"
+ [isViewOnly]="isViewOnly"
+ [allowDeletion]="allowDeletion"
+ (onValueChange)="onPropertyValueChange($event)"
+ (onDelete)="onMapKeyDelete($event)">
+ </app-input-list-item>
+ </ng-container>
+ <li class="input-value" *ngIf="!isViewOnly">
+ <input type="text" [(ngModel)]="mapEntryName" placeholder="{{ 'INPUT_LIST_MAP_KEY_PLACEHOLDER' | translate }}"/>
+ <a class="add-btn" (click)="addMapEntry()">{{ 'INPUT_LIST_ADD_MAP_ENTRY' | translate }}</a>
</li>
- <app-input-list-item
- *ngIf="!isTypeSimple(schema.property.type)"
- [name]="key"
- [type]="getDataType(schema.property.type)"
- [dataTypeMap]="dataTypeMap"
- [valueObjRef]="valueObjRef[key]"
- [schema]="schema"
- [isMapChild]="true"
- [nestingLevel]="nestingLevel + 1"
- [isViewOnly]="isViewOnly"
- [allowDeletion]="allowDeletion"
- (onValueChange)="onPropertyValueChange($event)"
- (onDelete)="onMapKeyDelete($event)">
- </app-input-list-item>
- </ng-container>
- <li class="input-value" *ngIf="!isViewOnly">
- <input type="text" [(ngModel)]="mapEntryName" placeholder="{{ 'INPUT_LIST_MAP_KEY_PLACEHOLDER' | translate }}"/>
- <a class="add-btn" (click)="addMapEntry()">{{ 'INPUT_LIST_ADD_MAP_ENTRY' | translate }}</a>
- </li>
- </ul>
- </ng-container>
+ </ul>
+ </ng-container>
+ </div>
</li>
\ No newline at end of file
import {TranslateModule} from '../../../../../../shared/translator/translate.module';
import {FormsModule} from '@angular/forms';
import {DataTypeModel} from '../../../../../../../models/data-types';
+import {ToscaFunctionModule} from '../../../../../properties-assignment/tosca-function/tosca-function.module';
describe('InputListItemComponent', () => {
let component: InputListItemComponent;
declarations: [ InputListItemComponent ],
imports: [
TranslateModule,
- FormsModule
+ FormsModule,
+ ToscaFunctionModule
]
})
.compileComponents();
import {SchemaPropertyGroupModel} from '../../../../../../../models/schema-property';
import {DerivedPropertyType, PropertyBEModel} from '../../../../../../../models/properties-inputs/property-be-model';
import {PROPERTY_DATA, PROPERTY_TYPES} from '../../../../../../../utils/constants';
+import {ToscaFunction} from '../../../../../../../models/tosca-function';
+import {ToscaFunctionValidationEvent} from "../../../../../../../ng2/pages/properties-assignment/tosca-function/tosca-function.component";
+import {InstanceFeDetails} from "../../../../../../../models/instance-fe-details";
@Component({
selector: 'app-input-list-item',
@Input() nestingLevel: number;
@Input() isListChild: boolean = false;
@Input() isMapChild: boolean = false;
+ @Input() showToscaFunctionOption: boolean = false;
@Input() listIndex: number;
@Input() isViewOnly: boolean;
@Input() allowDeletion: boolean = false;
+ @Input() toscaFunction: ToscaFunction;
+ @Input() componentInstanceMap: Map<string, InstanceFeDetails> = new Map();
@Output('onValueChange') onValueChangeEvent: EventEmitter<any> = new EventEmitter<any>();
@Output('onDelete') onDeleteEvent: EventEmitter<string> = new EventEmitter<string>();
@Output('onChildListItemDelete') onChildListItemDeleteEvent: EventEmitter<number> = new EventEmitter<number>();
isExpanded: boolean = false;
mapEntryName: string;
+ isToscaFunction: boolean = false;
+ property: PropertyBEModel;
ngOnInit() {
if (!this.nestingLevel) {
this.initEmptyPropertyInValueObjRef(property);
});
}
+
+ this.property = new PropertyBEModel();
+ this.property.type = this.type.name;
+ if (this.schema) {
+ this.property.schema = this.schema;
+ this.property.schemaType = this.schema.property.type;
+ }
+ if (this.toscaFunction) {
+ this.property.toscaFunction = this.toscaFunction;
+ this.valueObjRef = this.toscaFunction.value;
+ this.isToscaFunction = true;
+ }
}
private initEmptyPropertyInValueObjRef(property: PropertyBEModel) {
return this.dataTypeMap.get(type);
}
+ onValueTypeChange () {
+ if ( !this.isToscaFunction ) {
+ this.onValueChange(this.valueObjRef);
+ }
+ }
+
+ onToscaFunctionValidityChange(validationEvent: ToscaFunctionValidationEvent):void {
+ if (validationEvent.isValid) {
+ this.emitValueChangeEvent(validationEvent.toscaFunction, true);
+ return;
+ }
+ this.emitValueChangeEvent(undefined, true);
+ }
+
onValueChange(value: any): void {
+ if (this.isNumber(this.type.name)) {
+ this.emitValueChangeEvent(this.parseNumber(value));
+ return;
+ }
+ if (this.type.name == PROPERTY_TYPES.BOOLEAN) {
+ this.emitValueChangeEvent(this.parseBoolean(value));
+ return;
+ }
this.emitValueChangeEvent(value);
}
this.emitValueChangeEvent(this.valueObjRef);
}
- private emitValueChangeEvent(value: any) {
- this.onValueChangeEvent.emit({
+ private emitValueChangeEvent(value: any, isToscaFunction=false) {
+ let emitValue = {
name: this.name,
- value: value
- });
+ value: value,
+ isToscaFunction:isToscaFunction
+ };
+ this.onValueChangeEvent.emit(emitValue);
}
isRoot(): boolean {
}
addListElement() {
+ if (!this.valueObjRef) {
+ this.valueObjRef = [];
+ }
if (this.isTypeSimple(this.schema.property.type)) {
this.valueObjRef.push('');
} else if (this.isTypeComplex(this.schema.property.type) || this.isTypeMap(this.schema.property.type)) {
}
getSimpleValueInputType() {
+ if (this.isNumber(this.type.name)){
+ return 'number';
+ }
return 'text';
}
+ isNumber(type: string): boolean {
+ return type === PROPERTY_TYPES.INTEGER || type === PROPERTY_TYPES.FLOAT;
+ }
+
private parseBoolean(value: any) {
if (value === 'true') {
return true;
[dataTypeMap]="dataTypeMap"
[valueObjRef]="input.value"
[schema]="input.schema"
+ [toscaFunction]="input.toscaFunction"
+ [showToscaFunctionOption]="showToscaFunctionOption"
[isViewOnly]="isViewOnly"
[allowDeletion]="allowDeletion"
+ [componentInstanceMap]="componentInstanceMap"
(onValueChange)="onValueChange($event)"
(onDelete)="onDelete($event)">
</app-input-list-item>
.input-tree {
overflow: scroll;
- max-height: 300px;
max-width: 100%;
ul {
import {Component, Input} from '@angular/core';
import {DataTypeModel} from '../../../../../../models/data-types';
import {TranslateService} from '../../../../../shared/translator/translate.service';
+import {ToscaFunction} from '../../../../../../models/tosca-function';
+import {InstanceFeDetails} from "../../../../../../models/instance-fe-details";
@Component({selector: 'app-input-list-item', template: ''})
class InputListItemStubComponent {
@Input() schema: any;
@Input() allowDeletion: any;
@Input() isViewOnly: boolean;
+ @Input() toscaFunction: ToscaFunction;
+ @Input() showToscaFunctionOption: boolean;
+ @Input() componentInstanceMap: Map<string, InstanceFeDetails> = null;
}
const translateServiceMock: Partial<TranslateService> = {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ InputListComponent, InputListItemStubComponent ],
- imports: [ TranslateModule ],
+ imports: [
+ TranslateModule
+ ],
providers: [
{ provide: TranslateService, useValue: translateServiceMock }
]
import {DataTypeModel} from "../../../../../../models/data-types";
import {DerivedPropertyType} from "../../../../../../models/properties-inputs/property-be-model";
import {PROPERTY_DATA, PROPERTY_TYPES} from "../../../../../../utils/constants";
+import {InstanceFeDetails} from "../../../../../../models/instance-fe-details";
@Component({
selector: 'input-list',
@Input() isViewOnly: boolean;
@Input() title: string;
@Input() emptyMessage: string;
+ @Input() showToscaFunctionOption: boolean = false;
@Input() allowDeletion: boolean = false;
+ @Input() componentInstanceMap: Map<string, InstanceFeDetails> = new Map();
+ @Output('onInputsValidityChange') inputsValidityChangeEvent: EventEmitter<boolean> = new EventEmitter<boolean>();
@Output('onValueChange') inputValueChangeEvent: EventEmitter<InputOperationParameter> = new EventEmitter<InputOperationParameter>();
@Output('onDelete') inputDeleteEvent: EventEmitter<string> = new EventEmitter<string>();
onValueChange($event: any) {
const inputOperationParameter = this._inputs.find(input => input.name == $event.name);
if (inputOperationParameter) {
- inputOperationParameter.value = $event.value;
+ inputOperationParameter.valid = true;
+ if ($event.isToscaFunction) {
+ inputOperationParameter.toscaFunction = $event.value;
+ if (!inputOperationParameter.toscaFunction) {
+ inputOperationParameter.valid = false;
+ }
+ } else {
+ inputOperationParameter.value = $event.value;
+ inputOperationParameter.toscaFunction = null;
+ }
+ this.inputsValidityChangeEvent.emit(this._inputs.every(input => input.valid === true));
this.inputValueChangeEvent.emit(new InputOperationParameter(inputOperationParameter));
}
}
[inputs]="artifactTypeProperties"
[dataTypeMap]="dataTypeMap"
[isViewOnly]="isViewOnly"
+ [showToscaFunctionOption]="true"
+ [componentInstanceMap]="componentInstanceMap"
[allowDeletion]="false"
+ (onInputsValidityChange)="implementationPropsValidityChange($event)"
(onValueChange)="onArtifactPropertyValueChange($event)"
>
</input-list>
import {DataTypeService} from "../../../../services/data-type.service";
import {Observable} from "rxjs/Observable";
import {DataTypeModel} from "../../../../../models/data-types";
+import {InstanceFeDetails} from "../../../../../models/instance-fe-details";
@Component({
selector: 'operation-handler',
@ViewChild('interfaceOperationDropDown') interfaceOperationDropDown: DropDownComponent;
input: {
+ componentInstanceMap: Map<string, InstanceFeDetails>;
toscaArtifactTypes: Array<DropdownValue>;
selectedInterface: UIInterfaceModel;
selectedInterfaceOperation: InterfaceOperationModel;
validityChangedCallback: Function;
isViewOnly: boolean;
isEdit: boolean;
+ validImplementationProps:boolean;
modelName: string;
};
isLoading: boolean = false;
isViewOnly: boolean;
isEdit: boolean;
+ validImplementationProps:boolean;
interfaceTypes: Array<DropdownValue> = [];
interfaceTypeOptions: Array<DropDownOption> = [];
selectedInterfaceType: DropDownOption = undefined;
toscaArtifactTypeProperties: Array<PropertyBEModel> = [];
artifactTypeProperties: Array<InputOperationParameter> = [];
toscaArtifactTypes: Array<DropdownValue> = [];
+ componentInstanceMap: Map<string, InstanceFeDetails>;
enableAddArtifactImplementation: boolean;
propertyValueValid: boolean = true;
inputTypeOptions: any[];
ngOnInit() {
this.isViewOnly = this.input.isViewOnly;
this.isEdit = this.input.isEdit;
+ this.validImplementationProps = this.input.validImplementationProps;
+ this.componentInstanceMap = this.input.componentInstanceMap ? this.input.componentInstanceMap : null;
this.interfaceType = this.input.selectedInterface.type;
this.operationToUpdate = new InterfaceOperationModel(this.input.selectedInterfaceOperation);
this.operationToUpdate.interfaceId = this.input.selectedInterface.uniqueId;
}
onArtifactPropertyValueChange(changedProperty: InputOperationParameter) {
+ const property = this.toscaArtifactTypeProperties.find(artifactProperty => artifactProperty.name == changedProperty.name);
if (changedProperty.value instanceof Object) {
changedProperty.value = JSON.stringify(changedProperty.value);
}
- const property = this.toscaArtifactTypeProperties.find(artifactProperty => artifactProperty.name == changedProperty.name);
+ property.toscaFunction = null;
property.value = changedProperty.value;
+ if (changedProperty.isToscaFunction()) {
+ property.toscaFunction = changedProperty.toscaFunction;
+ property.value = changedProperty.toscaFunction.buildValueString();
+ }
+ }
+
+ implementationPropsValidityChange(validImplementationProps: boolean) {
+ this.validImplementationProps = validImplementationProps;
}
/**
input.schema = property.schema;
input.toscaDefaultValue = property.defaultValue;
input.value = property.value;
+ input.toscaFunction = property.toscaFunction;
inputList.push(input);
});
return inputList;
import {SdcUiComponentsModule} from "onap-ui-angular/dist";
import {UiElementsModule} from "app/ng2/components/ui/ui-elements.module";
import {PropertyTableModule} from "app/ng2/components/logic/properties-table/property-table.module";
+import {ToscaFunctionModule} from '../../../properties-assignment/tosca-function/tosca-function.module';
@NgModule({
declarations: [
TranslateModule,
UiElementsModule,
PropertyTableModule,
- ReactiveFormsModule
+ ReactiveFormsModule,
+ ToscaFunctionModule
],
exports: [
PropertyParamRowComponent
import {SubstitutionFilterTabComponent} from "./panel-tabs/substitution-filter-tab/substitution-filter-tab.component";
import {SubstitutionFilterModule} from "../../../components/logic/substitution-filter/substitution-filter.module";
import {InterfaceOperationsComponent} from "../interface-operatons/interface-operations.component";
-
+import {CompositionService} from "../composition.service";
@NgModule({
declarations: [
CompositionPanelComponent
// EnvParamsModule
],
- providers: [SdcUiServices.ModalService]
+ providers: [SdcUiServices.ModalService, CompositionService]
})
export class CompositionPanelModule {
openOperation: OperationModel;
enableWorkflowAssociation: boolean;
workflowIsOnline: boolean;
+ validImplementationProps:boolean = true;
@Input() component: IComponent;
@Input() readonly: boolean;
let enableAddArtifactImplementation = this.modalInstance.instance.dynamicContent.instance.enableAddArtifactImplementation;
if(enableAddArtifactImplementation) {
+ let validImplementationProps = this.modalInstance.instance.dynamicContent.instance.validImplementationProps;
let toscaArtifactTypeSelected = this.modalInstance.instance.dynamicContent.instance.toscaArtifactTypeSelected;
let isToscaArtifactType:boolean = !(typeof toscaArtifactTypeSelected == 'undefined' || _.isEmpty(toscaArtifactTypeSelected));
- disable = !bothSet || !isToscaArtifactType;
+ disable = !bothSet || !isToscaArtifactType || !validImplementationProps;
return disable;
}
disable = !bothSet;
selectedInterfaceOperation: operation ? operation : new InterfaceOperationModel(),
validityChangedCallback: this.disableSaveButton,
isViewOnly: this.readonly,
+ validImplementationProps: this.validImplementationProps,
'isEdit': isEdit,
interfaceTypesMap: this.interfaceTypesMap,
modelName: this.component.model
Code Review / sdc.git / commitdiff