TASK-1828886-3: previous PR review fixes

Author: marekpelc-pega

samples/android-cmp-app/src/androidInstrumentedTest/kotlin/com/pega/constellation/sdk/kmp/samples/androidcmpapp/test/cases/EmbeddedDataTest.kt

@@ -42,7 +42,7 @@ class EmbeddedDataTest : ComposeTest(PegaVersion.v24_2_2) {
         onNodeWithText("New Service").performClick()
 
         // verify form title and instruction
-        waitForNode("ED repeating view editable", substring = true)
+        waitForNode("ED repeating view editable (", substring = true)
         waitForNode("ED repeating view editable & readonly instruction")
 
         // verify repeating views presence
@@ -53,7 +53,7 @@ class EmbeddedDataTest : ComposeTest(PegaVersion.v24_2_2) {
         waitUntilExactlyOneExists(hasContentDescription("Delete item 1"))
         onNodeWithContentDescription("Delete item 1").performClick()
         waitForNodes("No items", count = 2)
-        waitUntilNodeCount(hasContentDescription("No items"), count = 2)
+        waitUntilNodeCount(hasContentDescription("No items icon"), count = 2)
         onNodeWithText("Add", substring = true).performClick()
 
         // verify error banner

scripts/dxcomponents/components/containers/templates/simple-table-manual.component.js

@@ -108,7 +108,7 @@ export class SimpleTableManualComponent extends BaseComponent {
         const conditions = this.#calculateConditions(editMode, allowActions, allowTableEdit)
 
         this.referenceListStr = getContext(this.pConn).referenceListStr;
-        this.props.label = this.pConn.getInheritedProps().label ?? labelProp ?? propertyLabel;
+        this.props.label = this.pConn.getInheritedProps().label || labelProp || propertyLabel;
         this.targetClassLabel = targetClassLabel;
         this.props.addButtonLabel = targetClassLabel ? `+ Add ${targetClassLabel}` : "+ Add";
         this.referenceList = referenceList.map((element) => {

scripts/dxcomponents/components/containers/view.component.js

@@ -77,10 +77,10 @@ export class ViewComponent extends ContainerBaseComponent {
 
         const template = this.#resolveTemplateType(configProps);
         const label = configProps.label ?? "";
-        const showLabel = configProps.showLabel || this.DETAILS_TEMPLATES.includes(template) || this.props.showLabel;
-
+        const showLabel = (configProps.showLabel || this.DETAILS_TEMPLATES.includes(template)) ?? this.props.showLabel;
+        const isTemplateWithHeader = !this.NO_HEADER_TEMPLATES.includes(template);
         this.props.label = inheritedProps.label ?? label;
-        this.props.showLabel = (inheritedProps.showLabel ?? showLabel) && !this.NO_HEADER_TEMPLATES.includes(template);
+        this.props.showLabel = (inheritedProps.showLabel || showLabel) && isTemplateWithHeader;
         this.props.visible = configProps.visibility ?? this.props.visible;
 
         if (this.READ_ONLY_DETAILS_TEMPLATES.includes(template)) {

ui-renderer-cmp/src/commonMain/kotlin/com/pega/constellation/sdk/kmp/ui/renderer/cmp/containers/FieldGroupTemplateRenderer.kt

@@ -70,7 +70,7 @@ class FieldGroupTemplateRenderer : ComponentRenderer<FieldGroupTemplateComponent
                     Spacer(modifier = Modifier.size(32.dp))
                     Icon(
                         painterResource(Res.drawable.icon_empty_list_48),
-                        "No items",
+                        "No items icon",
                         Modifier.size(48.dp)
                     )
                     Text(stringResource(Res.string.no_items))