import org.openecomp.sdc.be.datatypes.elements.InputDataDefinition;
import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
import org.openecomp.sdc.be.model.Component;
import org.openecomp.sdc.be.model.ComponentInstance;
import org.openecomp.sdc.be.model.DataTypeDefinition;
final ToscaArtifactDefinition toscaArtifactDefinition) {
final var properties = operationEntry.getValue().getImplementation().getProperties();
if (CollectionUtils.isNotEmpty(properties)) {
- final Map<String, PropertyDataDefinition> propertiesMap = new HashMap<>();
- properties.forEach(propertyDefinition -> propertiesMap.put(propertyDefinition.getName(), propertyDefinition));
+ final Map<String, String> propertiesMap = new HashMap<>();
+ properties.stream().filter(propertyDataDefinition -> StringUtils.isNotEmpty(propertyDataDefinition.getValue()))
+ .forEach(propertyDataDefinition -> propertiesMap.put(propertyDataDefinition.getName(), propertyDataDefinition.getValue()));
toscaArtifactDefinition.setProperties(propertiesMap);
}
}
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
@Getter
@Setter
private String artifact_version;
private String checksum;
private String checksum_algorithm;
- private Map<String, PropertyDataDefinition> properties;
+ private Map<String, String> properties;
}
toscaArtifactTypes: Array<DropdownValue> = [];
enableAddArtifactImplementation: boolean;
+ propertyValueValid: boolean = true;
ngOnInit() {
this.interfaceType = this.input.selectedInterface.displayType();
propertyValueValidation = (propertyValue): void => {
this.onPropertyValueChange(propertyValue);
- this.readonly = !propertyValue.isValid;
+ this.propertyValueValid = propertyValue.isValid;
+ this.readonly = !this.propertyValueValid;
+ this.validateRequiredField();
}
onRemoveInput = (inputParam: InputOperationParameter): void => {
validateRequiredField = () => {
this.readonly = true;
- let requiredFieldSelected = this.toscaArtifactTypeSelected && this.artifactName ? true : false;
- this.input.validityChangedCallback(requiredFieldSelected);
- if (requiredFieldSelected) {
+ const isRequiredFieldSelected = this.isRequiredFieldsSelected();
+ this.input.validityChangedCallback(isRequiredFieldSelected);
+ if (isRequiredFieldSelected && this.propertyValueValid) {
this.readonly = false;
}
}
+ private isRequiredFieldsSelected() {
+ return this.toscaArtifactTypeSelected && this.artifactName;
+ }
+
private checkFormValidForSubmit = (): boolean => {
- return this.operationToUpdate.name && this.isParamsValid();
+ return this.operationToUpdate.name && this.artifactName && this.isParamsValid();
}
private isParamsValid = (): boolean => {