diff options
| author |   imamSidero <imam.hussain@est.tech> | 2023-03-09 16:47:20 +0000 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2023-03-13 09:33:57 +0000 |
| commit | 532cb373b22b5684cbe6ea003d749560f051be08 (patch) | |
| tree | 38c75d9958bb7d27b5494bbaa3542e42d78353bd /catalog-ui/src/app/view-models | |
| parent | 0606cf6d6dd2cd4630f4cdd14e2e1eee626ca377 (diff) | |
Fix issue on list and map property entries in composition view
List and map entries are rendered correctly on composition view
Issue-ID: SDC-4404
Signed-off-by: Imam hussain <imam.hussain@est.tech>
Change-Id: I3c640f51fceb96701296b5e561e45d65dcc599c3
Diffstat (limited to 'catalog-ui/src/app/view-models')
2 files changed, 4 insertions, 2 deletions
diff --git a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts index 52e8c0018a..61a58c54dd 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts +++ b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view-model.ts @@ -188,7 +188,7 @@ export class PropertyFormViewModel { private initForNotSimpleType = ():void => { const property = this.$scope.editPropertyModel.property; - this.$scope.isTypeDataType = this.isDataTypeForPropertyType(this.$scope.editPropertyModel.property); + this.$scope.isTypeDataType = this.DataTypesService.isDataTypeForPropertyType(this.$scope.editPropertyModel.property); if (property.isToscaFunction()) { this.initValueForGetFunction(); return; @@ -305,6 +305,7 @@ export class PropertyFormViewModel { } } this.initResource(); + this.initForNotSimpleType(); this.initComponentInstanceMap(); this.$scope.validateJson = (json:string):boolean => { @@ -320,7 +321,6 @@ export class PropertyFormViewModel { 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; }); diff --git a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html index 2840e86523..b717d7a147 100644 --- a/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html +++ b/catalog-ui/src/app/view-models/forms/property-forms/component-property-form/property-form-view.html @@ -185,6 +185,7 @@ default-value="{{getDefaultValue()}}" max-length="maxLength" types="dataTypes" + is-service="!componentMetadata.isVfc" constraints="editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues"> </type-map> </div> @@ -200,6 +201,7 @@ default-value="{{getDefaultValue()}}" max-length="maxLength" types="dataTypes" + is-service="!componentMetadata.isVfc" constraints="editPropertyModel.property.constraints && editPropertyModel.property.constraints[0].validValues"></type-list> </div> |