From 1580acb7be557dbb4a12e4aea33b307d720a3d5f Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Mar 2024 13:19:01 +0100
Subject: [PATCH 1/2] 113319: Add dropdown entry to clear selection

(cherry picked from commit 13d1547b3dbf5d4cd74617d6327044da798ed44e)
---
 .../dynamic-scrollable-dropdown.component.html              | 6 ++++++
 src/assets/i18n/en.json5                                    | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 544b41ac521..b4e6ac2c44f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -41,6 +41,12 @@
          [scrollWindow]="false">
 
       <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item collection-item text-truncate"
+              (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
+              title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
+      >
+        <i>{{ 'dropdown.clear' | translate }}</i>
+      </button>
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
               [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d4731f9bb92..dee06f233a4 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1678,6 +1678,10 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dropdown.clear": "Clear selection",
+
+  "dropdown.clear.tooltip": "Clear the selected option",
+
   "dso.name.untitled": "Untitled",
 
   "dso.name.unnamed": "Unnamed",

From 31d3ab08117f5b4ca712737fa45eae5283e97d54 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 26 Mar 2024 07:59:34 +0100
Subject: [PATCH 2/2] 113319: Fix dropdown component spec

(cherry picked from commit 70357803e86caabc6357b7cbec9db1ef8edd2a56)
---
 .../dynamic-scrollable-dropdown.component.spec.ts               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 14a8aeaecbe..539c1608a1c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -186,7 +186,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         scrollableDropdownFixture.detectChanges();
 
         de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
-        btnEl = de[0].nativeElement;
+        btnEl = de[1].nativeElement;
 
         btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();