From 145db5deaa26535e774f53e51c2e9a281cf92cbb Mon Sep 17 00:00:00 2001
From: Stefan Dragomir <stefand@ENSRO0422.local>
Date: Thu, 30 Oct 2025 20:52:50 +0200
Subject: [PATCH] FORMS-21002: Programmatic label does not convey purpose of
 control @sunnym @vavarshn

---
 .../review/v1/review/clientlibs/site/js/reviewview.js    | 9 +++++----
 .../form/review/v1/review/template/fieldTemplate.html    | 2 +-
 .../form/review/v1/review/template/panelTemplate.html    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
index 2e12c323bb..1245bdadbf 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
@@ -115,9 +115,6 @@
       if(value){
         value.setAttribute('aria-labelledby', id);
       }
-      if(editButton && editButton.getAttribute(Review.DATA_ATTRIBUTE_VISIBLE) === 'true'){
-        editButton.setAttribute('aria-describedby', id);
-      }
     }
 
     static isRepeatable(item) {
@@ -308,7 +305,11 @@
       const editButton = cloneNode.querySelector(Review.selectors.editButton);
       if (editButton) {
         editButton.setAttribute(Review.selectors.fieldId, item.id);
-        editButton.setAttribute('aria-label', item?.label?.value);
+        const currentAriaLabel = editButton.getAttribute('aria-label');
+        const currentItemLabel = item?.label?.value;
+        if (currentItemLabel && !currentAriaLabel.includes(currentItemLabel)) {
+          editButton.setAttribute('aria-label', currentAriaLabel + " " + currentItemLabel);
+        }
         if (item.enabled === false) {
           editButton.setAttribute('disabled', true);
         }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/fieldTemplate.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/fieldTemplate.html
index 35ce3308e2..6b997d7328 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/fieldTemplate.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/fieldTemplate.html
@@ -18,6 +18,6 @@
   <div class="${bemBlock}__field">
     <div class="${bemBlock}__label" data-cmp-review-label></div>
     <div class="${bemBlock}__value" data-cmp-review-value></div>
-    <button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button"></button>
+    <button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button" aria-label="${'Edit' @ i18n, locale=request.locale}"></button>
   </div>
 </template>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/panelTemplate.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/panelTemplate.html
index c8ec2e4e33..c83187f465 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/panelTemplate.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/template/panelTemplate.html
@@ -18,7 +18,7 @@
   <div class="${bemBlock}__panel">
     <div class="${bemBlock}__label-container">
       <div class="${bemBlock}__label" data-cmp-review-label></div>
-      <button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button"></button>
+      <button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button" aria-label="${'Edit' @ i18n, locale=request.locale}"></button>
     </div>
     <div class="${bemBlock}__content" data-cmp-review-content></div>
   </div>