From 2e3c6c573d337abba1804ac6a831a4654a578673 Mon Sep 17 00:00:00 2001
From: hrao <hrao@akamai.com>
Date: Thu, 21 Nov 2024 17:59:52 +0530
Subject: [PATCH 1/2] fix: [M3-8912] - Create support ticket for bucket created
 through legacy flow

---
 .../SupportTicketProductSelectionFields.tsx   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx b/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx
index d834f55fb2d..c0f67b69c3d 100644
--- a/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx
+++ b/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx
@@ -134,10 +134,12 @@ export const SupportTicketProductSelectionFields = (props: Props) => {
     if (entityType === 'bucket') {
       return (
         reactQueryEntityDataMap['bucket']?.buckets?.map(
-          ({ label, region }) => ({
-            label,
-            value: region ?? '',
-          })
+          ({ cluster, label, region }) => {
+            return {
+              label,
+              value: region ?? cluster,
+            };
+          }
         ) || []
       );
     }
@@ -187,8 +189,15 @@ export const SupportTicketProductSelectionFields = (props: Props) => {
     : undefined;
 
   const selectedEntity =
-    entityOptions.find((thisEntity) => String(thisEntity.value) === entityId) ||
-    null;
+    entityType === 'bucket'
+      ? entityOptions.find(
+          (thisEntity) =>
+            String(thisEntity.value) === entityId &&
+            thisEntity.label === entityInputValue
+        ) || null
+      : entityOptions.find(
+          (thisEntity) => String(thisEntity.value) === entityId
+        ) || null;
 
   const renderEntityTypes = () => {
     return Object.keys(ENTITY_MAP).map((key: string) => {

From 35af9174554667d1babe7b2ea4375900529ac2e8 Mon Sep 17 00:00:00 2001
From: hrao <hrao@akamai.com>
Date: Thu, 21 Nov 2024 19:10:57 +0530
Subject: [PATCH 2/2] Added changeset: Create support ticket for buckets
 created through legacy flow

---
 packages/manager/.changeset/pr-11300-fixed-1732196456888.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-11300-fixed-1732196456888.md

diff --git a/packages/manager/.changeset/pr-11300-fixed-1732196456888.md b/packages/manager/.changeset/pr-11300-fixed-1732196456888.md
new file mode 100644
index 00000000000..39f6af7ae30
--- /dev/null
+++ b/packages/manager/.changeset/pr-11300-fixed-1732196456888.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Create support ticket for buckets created through legacy flow ([#11300](https://github.com/linode/manager/pull/11300))