From b56eb053195fa378e0711118cd45b5276fe78169 Mon Sep 17 00:00:00 2001
From: Josemi <josemijuanes@gmail.com>
Date: Tue, 6 Aug 2024 15:53:39 +0200
Subject: [PATCH 1/6] wc: Fix event target in clinical analysis grid actions
 #TASK-6313

---
 src/webcomponents/clinical/clinical-analysis-grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
index f0f4977df..bdd9cb010 100644
--- a/src/webcomponents/clinical/clinical-analysis-grid.js
+++ b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -436,7 +436,7 @@ export default class ClinicalAnalysisGrid extends LitElement {
     }
 
     async onActionClick(e, _, row) {
-        const action = e.target.dataset.action?.toLowerCase() || e.detail.action;
+        const action = e.currentTarget.dataset.action?.toLowerCase() || e.detail.action;
         switch (action) {
             case "edit":
                 this.clinicalAnalysisUpdateId = row.id;

From c71b3dd16edf98a6b41bf0cccde26e5fccc61106 Mon Sep 17 00:00:00 2001
From: Josemi <josemijuanes@gmail.com>
Date: Tue, 6 Aug 2024 15:54:19 +0200
Subject: [PATCH 2/6] wc: Minor fixes getting action in clinical analysis grid
 #TASK-6313

---
 src/webcomponents/clinical/clinical-analysis-grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
index bdd9cb010..f2cde4369 100644
--- a/src/webcomponents/clinical/clinical-analysis-grid.js
+++ b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -436,7 +436,7 @@ export default class ClinicalAnalysisGrid extends LitElement {
     }
 
     async onActionClick(e, _, row) {
-        const action = e.currentTarget.dataset.action?.toLowerCase() || e.detail.action;
+        const action = e.currentTarget?.dataset?.action?.toLowerCase() || e.detail?.action;
         switch (action) {
             case "edit":
                 this.clinicalAnalysisUpdateId = row.id;

From 0979e270bd19b21f1010798e8a2bae02466c5b3a Mon Sep 17 00:00:00 2001
From: Josemi <josemijuanes@gmail.com>
Date: Tue, 6 Aug 2024 16:59:57 +0200
Subject: [PATCH 3/6] wc: Fix style of status dropdown in clinical analysis
 grid #TASK-6313

---
 src/webcomponents/clinical/clinical-analysis-grid.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
index f2cde4369..ca3c19238 100644
--- a/src/webcomponents/clinical/clinical-analysis-grid.js
+++ b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -386,12 +386,12 @@ export default class ClinicalAnalysisGrid extends LitElement {
                     <ul class="dropdown-menu">
                         ${_status[row.type].map(({id, description}) => `
                             <li>
-                                <a class="d-flex dropdown-item" data-action="statusChange" data-status="${id}">
+                                <a class="d-flex dropdown-item py-2" data-action="statusChange" data-status="${id}" style="cursor:pointer;">
                                     <div class="flex-grow-1">
-                                        ${id === currentStatus ? `<strong>${id}</strong>` : id}
-                                        <p class="form-text"><small>${description}</small></p>
+                                        <div class="${id === currentStatus ? "fw-bold" : ""}">${id}</div>
+                                        <div class="small text-secondary">${description}</div>
                                     </div>
-                                    ${id === currentStatus ? "<i class=\"fas fa-check\"></i>" : ""}
+                                    ${id === currentStatus ? `<i class="fas fa-check"></i>` : ""}
                                 </a>
                             </li>
                         `).join("")}

From 23479ececebaeebd674f7604b4b7df4256b04133 Mon Sep 17 00:00:00 2001
From: Josemi <josemijuanes@gmail.com>
Date: Tue, 6 Aug 2024 17:02:36 +0200
Subject: [PATCH 4/6] wc: Fix style of priority dropdown in clinical analysis
 grid #TASK-6313

---
 .../clinical/clinical-analysis-grid.js             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
index ca3c19238..c538f5133 100644
--- a/src/webcomponents/clinical/clinical-analysis-grid.js
+++ b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -343,14 +343,14 @@ export default class ClinicalAnalysisGrid extends LitElement {
                     <ul class="dropdown-menu">
                         ${_priorities.map(priority => `
                             <li>
-                                <a class="d-flex dropdown-item" data-action="priorityChange" data-priority="${priority.id}">
+                                <a class="d-flex dropdown-item py-2" data-action="priorityChange" data-priority="${priority.id}" style="cursor:pointer;">
                                     <div class="flex-grow-1">
-                                        <span class="badge ${priorityRankToColor[priority?.rank ?? ""] ?? ""}">
-                                            ${priority.id}
-                                        </span>
-                                        <p class="form-text">
-                                            <small>${priority.description}</small>
-                                        </p>
+                                        <div class="">
+                                            <span class="badge ${priorityRankToColor[priority?.rank ?? ""] ?? ""}">
+                                                ${priority.id}
+                                            </span>
+                                        </div>
+                                        <div class="small text-secondary">${priority.description}</div>
                                     </div>
                                     ${priority.id === value?.id ? "<i class=\"fas fa-check\"></i>" : ""}
                                 </a>

From a54c4cf96a0e2759f04eca3646653994bf4a60f3 Mon Sep 17 00:00:00 2001
From: Josemi <josemijuanes@gmail.com>
Date: Tue, 6 Aug 2024 17:03:20 +0200
Subject: [PATCH 5/6] wc: Remove empty lines in status and priority formatters
 #TASK-6313

---
 src/webcomponents/clinical/clinical-analysis-grid.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
index c538f5133..3be53f949 100644
--- a/src/webcomponents/clinical/clinical-analysis-grid.js
+++ b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -337,7 +337,6 @@ export default class ClinicalAnalysisGrid extends LitElement {
                     <span class="badge ${currentPriorityLabel} me-auto top-0">
                         ${currentPriorityText}
                     </span>
-
                 </button>
                 ${isEditable ? `
                     <ul class="dropdown-menu">
@@ -380,7 +379,6 @@ export default class ClinicalAnalysisGrid extends LitElement {
             <div class="dropdown">
                 <button class="${btnClassName}" type="button" data-bs-toggle="dropdown" ${!isEditable ? "disabled=\"disabled\"" : ""}>
                     <span class='me-auto'">${currentStatus}</span>
-
                 </button>
                 ${isEditable ? `
                     <ul class="dropdown-menu">

From b3d52a320883461540ba6593dce4a6cda446c9e3 Mon Sep 17 00:00:00 2001
From: Josemi <josemijuanes@gmail.com>
Date: Tue, 6 Aug 2024 17:06:29 +0200
Subject: [PATCH 6/6] wc: Fix priority checked icon in clinical analysis grid
 #TASK-6313

---
 src/webcomponents/clinical/clinical-analysis-grid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webcomponents/clinical/clinical-analysis-grid.js b/src/webcomponents/clinical/clinical-analysis-grid.js
index 3be53f949..8b83ea075 100644
--- a/src/webcomponents/clinical/clinical-analysis-grid.js
+++ b/src/webcomponents/clinical/clinical-analysis-grid.js
@@ -351,7 +351,7 @@ export default class ClinicalAnalysisGrid extends LitElement {
                                         </div>
                                         <div class="small text-secondary">${priority.description}</div>
                                     </div>
-                                    ${priority.id === value?.id ? "<i class=\"fas fa-check\"></i>" : ""}
+                                    ${priority.id === value?.id ? `<i class="fas fa-check"></i>` : ""}
                                 </a>
                             </li>
                         `).join("")}