fieldsPrefixName: '=',
readOnly: '=',
defaultValue: '@',
- // types: '=',
- expandByDefault: '='
-
+ types: '=',
+ expandByDefault: '='
};
restrict = 'E';
private initDataOnScope = (scope:any, $attr:any):void => {
scope.dataTypesService = this.DataTypesService;
- scope.dataTypeProperties = this.DataTypesService.getFirsLevelOfDataTypeProperties(scope.typeName);
+ scope.dataTypeProperties = this.getDataTypeProperties(scope.typeName, scope.types);
if ($attr.defaultValue) {
scope.currentTypeDefaultValue = JSON.parse($attr.defaultValue);
} else {
}
});
};
+
+ private getDataTypeProperties = (dataTypeName:string, typesInModel:DataTypesMap):Array<DataTypePropertyModel> => {
+ let properties = typesInModel[dataTypeName].properties || [];
+ if (typesInModel[dataTypeName].derivedFromName != "tosca.datatypes.Root") {
+ properties = this.getDataTypeProperties(typesInModel[dataTypeName].derivedFromName, typesInModel).concat(properties);
+ }
+ return properties;
+ };
private rerender = (scope:any):void => {
scope.expanded = false;
type-name="schemaProperty.type"
parent-form-obj="parentFormObj"
fields-prefix-name="fieldsPrefixName+''+$index"
+ types="types"
read-only="readOnly"></fields-structure>
</div>
<div data-ng-if="!isSchemaTypeDataType">
* Created by rcohen on 9/15/2016.
*/
'use strict';
-import {SchemaProperty, PropertyModel} from "app/models";
-import {ValidationUtils, PROPERTY_TYPES} from "app/utils";
+import {SchemaProperty, PropertyModel, DataTypesMap} from "app/models";
+import {ValidationUtils, PROPERTY_TYPES, PROPERTY_DATA} from "app/utils";
import {DataTypesService} from "app/services";
import {InstanceFeDetails} from "app/models/instance-fe-details";
import {ToscaGetFunction} from "app/models/tosca-get-function";
stringSchema: SchemaProperty;
showToscaFunction: Array<boolean>;
constraints:string[];
+ types:DataTypesMap;
getValidationPattern(type:string):RegExp;
validateIntRange(value:string):boolean;
readOnly: '=',//is form read only
defaultValue: '@',//this list default value
maxLength: '=',
- constraints: '='
+ constraints: '=',
+ types: '='
};
restrict = 'E';
template = ():string => {
return require('./type-list-directive.html');
};
+
+ private isDataTypeForSchemaType = (property:SchemaProperty, types:DataTypesMap):boolean=> {
+ property.simpleType = "";
+ if (property.type && PROPERTY_DATA.TYPES.indexOf(property.type) > -1) {
+ return false;
+ }
+ let simpleType = this.getTypeForDataTypeDerivedFromSimple(property.type, types);
+ if (simpleType) {
+ property.simpleType = simpleType;
+ return false;
+ }
+ return true;
+ };
+
+ private getTypeForDataTypeDerivedFromSimple = (dataTypeName:string, types:DataTypesMap):string => {
+ if (!types[dataTypeName]) {
+ return 'string';
+ }
+ if (types[dataTypeName].derivedFromName == "tosca.datatypes.Root" || types[dataTypeName].properties) {
+ return null;
+ }
+ if (PROPERTY_DATA.SIMPLE_TYPES.indexOf(types[dataTypeName].derivedFromName) > -1) {
+ return types[dataTypeName].derivedFromName
+ }
+ return this.getTypeForDataTypeDerivedFromSimple(types[dataTypeName].derivedFromName, types);
+ };
link = (scope:ITypeListScope, element:any, $attr:any) => {
scope.propertyNameValidationPattern = this.PropertyNameValidationPattern;
});
//reset valueObjRef when schema type is changed
scope.$watchCollection('schemaProperty.type', (newData:any):void => {
- scope.isSchemaTypeDataType = this.DataTypesService.isDataTypeForSchemaType(scope.schemaProperty);
+ scope.isSchemaTypeDataType = this.isDataTypeForSchemaType(scope.schemaProperty, scope.types);
});
//when user brows between properties in "edit property form"
type-name="schemaProperty.type"
parent-form-obj="parentFormObj"
fields-prefix-name="'mapValue'+fieldsPrefixName+''+$index"
+ types="types"
read-only="readOnly"
></fields-structure>
</div>
* Created by rcohen on 9/15/2016.
*/
'use strict';
-import {ValidationUtils, PROPERTY_TYPES} from "app/utils";
+import {ValidationUtils, PROPERTY_TYPES, PROPERTY_DATA} from "app/utils";
import {DataTypesService} from "app/services";
-import {SchemaProperty, PropertyModel} from "app/models";
+import {SchemaProperty, PropertyModel, DataTypesMap} from "app/models";
import {InstanceFeDetails} from "app/models/instance-fe-details";
import {ToscaGetFunction} from "app/models/tosca-get-function";
import {SubPropertyToscaFunction} from "app/models/sub-property-tosca-function";
constraints:string[];
showAddBtn: boolean;
showToscaFunction: Array<boolean>;
+ types:DataTypesMap;
getValidationPattern(type:string):RegExp;
validateIntRange(value:string):boolean;
maxLength: '=',
constraints: '=',
showAddBtn: '=?',
- parentProperty: '='
+ parentProperty: '=',
+ types: '='
};
restrict = 'E';
template = (): string => {
return require('./type-map-directive.html');
};
+
+ private isDataTypeForSchemaType = (property:SchemaProperty, types:DataTypesMap):boolean=> {
+ property.simpleType = "";
+ if (property.type && PROPERTY_DATA.TYPES.indexOf(property.type) > -1) {
+ return false;
+ }
+ let simpleType = this.getTypeForDataTypeDerivedFromSimple(property.type, types);
+ if (simpleType) {
+ property.simpleType = simpleType;
+ return false;
+ }
+ return true;
+ };
+
+ private getTypeForDataTypeDerivedFromSimple = (dataTypeName:string, types:DataTypesMap):string => {
+ if (!types[dataTypeName]) {
+ return 'string';
+ }
+ if (types[dataTypeName].derivedFromName == "tosca.datatypes.Root" || types[dataTypeName].properties) {
+ return null;
+ }
+ if (PROPERTY_DATA.SIMPLE_TYPES.indexOf(types[dataTypeName].derivedFromName) > -1) {
+ return types[dataTypeName].derivedFromName
+ }
+ return this.getTypeForDataTypeDerivedFromSimple(types[dataTypeName].derivedFromName, types);
+ };
link = (scope:ITypeMapScope, element:any, $attr:any) => {
scope.showAddBtn = angular.isDefined(scope.showAddBtn) ? scope.showAddBtn : true;
//reset valueObjRef and mapKeys when schema type is changed
scope.$watchCollection('schemaProperty.type', (newData:any):void => {
- scope.isSchemaTypeDataType = this.DataTypesService.isDataTypeForSchemaType(scope.schemaProperty);
+ scope.isSchemaTypeDataType = this.isDataTypeForSchemaType(scope.schemaProperty, scope.types);
if (scope.valueObjRef) {
scope.mapKeys = Object.keys(scope.valueObjRef);
//keeping another copy of the keys, as the mapKeys gets overridden sometimes
export class PropertyValidationEvent {
isValid: boolean;
property: PropertyBEModel;
-}
\ No newline at end of file
+}
this.$scope.editPropertyModel.hasGetFunctionValue = this.$scope.editPropertyModel.property.isToscaFunction();
this.$scope.editPropertyModel.isGetFunctionValid = true;
}
+
+ private isDataTypeForPropertyType = (property:PropertyModel):boolean=> {
+ property.simpleType = "";
+ if (property.type && PROPERTY_DATA.TYPES.indexOf(property.type) > -1) {
+ return false;
+ }
+ let simpleType = this.getTypeForDataTypeDerivedFromSimple(property.type);
+ if (simpleType) {
+ property.simpleType = simpleType;
+ return false;
+ }
+ return true;
+ };
+
+ private getTypeForDataTypeDerivedFromSimple = (dataTypeName:string):string => {
+ if (!this.$scope.dataTypes[dataTypeName]) {
+ return 'string';
+ }
+ if (this.$scope.dataTypes[dataTypeName].derivedFromName == "tosca.datatypes.Root" || this.$scope.dataTypes[dataTypeName].properties) {
+ return null;
+ }
+ if (PROPERTY_DATA.SIMPLE_TYPES.indexOf(this.$scope.dataTypes[dataTypeName].derivedFromName) > -1) {
+ return this.$scope.dataTypes[dataTypeName].derivedFromName
+ }
+ return this.getTypeForDataTypeDerivedFromSimple(this.$scope.dataTypes[dataTypeName].derivedFromName);
+ };
private initForNotSimpleType = ():void => {
const property = this.$scope.editPropertyModel.property;
- this.$scope.isTypeDataType = this.DataTypesService.isDataTypeForPropertyType(this.$scope.editPropertyModel.property);
+ this.$scope.isTypeDataType = this.isDataTypeForPropertyType(this.$scope.editPropertyModel.property);
if (property.isToscaFunction()) {
this.initValueForGetFunction();
return;
}
}
this.initResource();
- this.initForNotSimpleType();
this.initComponentInstanceMap();
this.$scope.validateJson = (json:string):boolean => {
this.DataTypesService.fetchDataTypesByModel(this.workspaceService.metadata.model).then(response => {
this.$scope.dataTypes = response.data as DataTypesMap;
+
this.$scope.nonPrimitiveTypes = _.filter(Object.keys(this.$scope.dataTypes), (type:string)=> {
return this.$scope.editPropertyModel.types.indexOf(type) == -1;
});
-
+ this.initForNotSimpleType();
this.$scope.isLoading = false;
});
return this.topologyTemplateService.deleteProperty(this.workspaceService.metadata.componentType, this.workspaceService.metadata.uniqueId, propertyId).map(onSuccess, onFailed);
};
-}
\ No newline at end of file
+}
fields-prefix-name="currentPropertyIndex"
read-only="editPropertyModel.property.readonly && !isPropertyValueOwner"
default-value="{{getDefaultValue()}}"
+ types="dataTypes"
expand-by-default="true"></fields-structure>
</div>
read-only="(editPropertyModel.property.readonly && !isPropertyValueOwner) || isVnfConfiguration"
default-value="{{getDefaultValue()}}"
max-length="maxLength"
+ types="dataTypes"
constraints="editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues">
</type-map>
</div>
read-only="editPropertyModel.property.readonly && !isPropertyValueOwner"
default-value="{{getDefaultValue()}}"
max-length="maxLength"
+ types="dataTypes"
constraints="editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues"></type-list>
</div>
Code Review / sdc.git / commitdiff