diff options
| author |   imamSidero <imam.hussain@est.tech> | 2023-02-17 17:03:38 +0000 |
|---|---|---|
| committer |   Vasyl Razinkov <vasyl.razinkov@est.tech> | 2023-02-21 18:10:23 +0000 |
| commit | 3eb6f41297cedc038d18582d31d65dab05b351b8 (patch) | |
| tree | 931a757472ddf6c63882357abbc390a18caf90d2 /catalog-ui | |
| parent | 45ae8a3555d49190622767a548d1c4697a379c9b (diff) | |
Fix issue on adding values to complex properties in Property Assignment
value field for complex types are restored and validation for the complex type is fixed
Issue-ID: SDC-4400
Signed-off-by: Imam hussain <imam.hussain@est.tech>
Change-Id: I320b2f2bdb8c8e236e7cd232902a4a07d0c245c8
Diffstat (limited to 'catalog-ui')
| -rw-r--r-- | catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts | 2 | ||||
| -rw-r--r-- | catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts b/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts index 02b2d0b30d..c2ea1ecbdf 100644 --- a/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts +++ b/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts @@ -119,7 +119,7 @@ export class DerivedFEProperty extends PropertyBEModel { } } - this.valueObj = ((this.type == PROPERTY_TYPES.JSON || this.type == PROPERTY_TYPES.MAP) && typeof value == 'object') ? JSON.stringify(value) : value; + this.valueObj = (this.type == PROPERTY_TYPES.JSON && typeof value == 'object') ? JSON.stringify(value) : value; if (value != null) { this.value = typeof value == 'object' ? JSON.stringify(value) : value; } diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html index 959ed36625..8e7e3a1282 100644 --- a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html +++ b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html @@ -25,7 +25,7 @@ <div class="inner-cell-div" tooltip="{{property.name}}"><span>{{property.name}}</span></div> </div> <div class="table-cell" *ngIf="!canBeDeclared && !property.isChildOfListOrMap"> - <checkbox *ngIf="nestedLevel != 1" [(checked)]="property.isSelected" [disabled]="property.isDisabled || readonly || property.mapKey == ''" (checkedChange)="toggleTosca.emit(property)" ></checkbox> + <checkbox *ngIf="nestedLevel == 2" [(checked)]="property.isSelected" [disabled]="property.isDisabled || readonly || property.mapKey == ''" (checkedChange)="toggleTosca.emit(property)" ></checkbox> <div class="inner-cell-div" tooltip="{{property.name}}"><span>{{property.name}}</span></div> </div> <!-- simple children of complex type within map or list --> <div class="table-cell map-entry" *ngIf="property.isChildOfListOrMap && propType == derivedPropertyTypes.MAP && !property.mapInlist"><!-- map left cell --> |