From da6b4a245482f4eebade8f487fc9d63f456469ab Mon Sep 17 00:00:00 2001 From: JvD_Ericsson Date: Thu, 21 Sep 2023 11:41:34 +0100 Subject: Fix bugs in attribute outputs page * Attributes being added to the template for each output declared if the attribute is a property and has a value * Unable to set a default value on a property from Output page * Fix issues with the save button * infinite save pop up when trying to leave the page with changes and clicking save * parse error in the console that would make the save button remain enabled after save was succesful * output values not being removed from attribute after output is deleted * nested attribute values not being updated Issue-ID: SDC-4632 Signed-off-by: JvD_Ericsson Change-Id: I08abd6cd96963b09be7941c3a91559e241ace24f --- catalog-ui/src/app/models/attributes.ts | 2 -- .../components/logic/attributes-table/attributes-table.component.html | 2 +- .../attributes-table/dynamic-attribute/dynamic-attribute.component.html | 2 +- .../ng2/pages/attributes-outputs/attributes-outputs.page.component.ts | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'catalog-ui') diff --git a/catalog-ui/src/app/models/attributes.ts b/catalog-ui/src/app/models/attributes.ts index 711e5b3c49..3bbbd1eb74 100644 --- a/catalog-ui/src/app/models/attributes.ts +++ b/catalog-ui/src/app/models/attributes.ts @@ -105,8 +105,6 @@ export class AttributeModel extends AttributeBEModel implements IAttributeModel // forcing creating new object, so editing different one than the object in the table this.schema = new SchemaAttributeGroupModel(new SchemaAttribute(this.schema.property)); } - - this.convertValueToView(); } public convertToServerObject(): string { diff --git a/catalog-ui/src/app/ng2/components/logic/attributes-table/attributes-table.component.html b/catalog-ui/src/app/ng2/components/logic/attributes-table/attributes-table.component.html index e9360421a6..a6ce2884ca 100644 --- a/catalog-ui/src/app/ng2/components/logic/attributes-table/attributes-table.component.html +++ b/catalog-ui/src/app/ng2/components/logic/attributes-table/attributes-table.component.html @@ -84,7 +84,7 @@ [attributeNameSearchText]="attributeNameSearchText" [readonly]="readonly" (attributeChanged)="onAttributeChanged(property)" - (expandChild)="property.updateExpandedChildPropertyId($event)" + (expandChild)="property.updateExpandedChildAttributeId($event)" (clickOnAttributeRow)="onClickAttributeInnerRow($event, instanceId)" (checkAttribute)="attributeChecked(property, $event)" > diff --git a/catalog-ui/src/app/ng2/components/logic/attributes-table/dynamic-attribute/dynamic-attribute.component.html b/catalog-ui/src/app/ng2/components/logic/attributes-table/dynamic-attribute/dynamic-attribute.component.html index 7f271af4e1..f5de4aac2c 100644 --- a/catalog-ui/src/app/ng2/components/logic/attributes-table/dynamic-attribute/dynamic-attribute.component.html +++ b/catalog-ui/src/app/ng2/components/logic/attributes-table/dynamic-attribute/dynamic-attribute.component.html @@ -89,7 +89,7 @@ [attributeNameSearchText]="attributeNameSearchText" [readonly]="readonly" [hasChildren]="getHasChildren(prop)" - (propertyChanged)="childValueChanged(prop)" + (attributeChanged)="childValueChanged(prop)" (mapKeyChanged)="updateChildKeyInParent(prop, $event)" (expandChild)="expandChildById($event)" (deleteItem)="deleteListOrMapItem($event)" diff --git a/catalog-ui/src/app/ng2/pages/attributes-outputs/attributes-outputs.page.component.ts b/catalog-ui/src/app/ng2/pages/attributes-outputs/attributes-outputs.page.component.ts index 48700f2ecb..6dc8abfa4d 100644 --- a/catalog-ui/src/app/ng2/pages/attributes-outputs/attributes-outputs.page.component.ts +++ b/catalog-ui/src/app/ng2/pages/attributes-outputs/attributes-outputs.page.component.ts @@ -655,6 +655,8 @@ export class AttributesOutputsComponent { if (this.isAttributesTabSelected) { this.checkedAttributesCount = 0; } + this.hasChangedData = false; + this.isValidChangedData = false; }, () => { this.Notification.error({ -- cgit 1.2.3-korg