From 0bbcde1946b2fe50c56ffcaf8ca9ba5f338752f6 Mon Sep 17 00:00:00 2001
From: Miki <miki@amazon.com>
Date: Fri, 2 Feb 2024 09:57:13 -0800
Subject: [PATCH 1/2] Fix vertical alignment of expand details button Fix
 colspan of details cells

Signed-off-by: Miki <miki@amazon.com>
---
 .../components/default_discover_table/_table_cell.scss        | 4 ++--
 .../components/default_discover_table/table_rows.tsx          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss b/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
index 74ff79b4976b..d26fd5e1c56e 100644
--- a/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
+++ b/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
@@ -2,8 +2,8 @@
   border-top: none !important;
 }
 
-.osdDocTableCell__toggleDetails {
-  padding: 7px 0 0 4px;
+.osd-table td.osdDocTableCell__toggleDetails {
+  padding: 5px 0 0 4px;
 }
 
 /**
diff --git a/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx b/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
index 8cc38a9c9fab..c1e607ac8769 100644
--- a/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
+++ b/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
@@ -131,7 +131,7 @@ export const TableRow = ({
 
   const expandedTableRow = (
     <tr key={'x' + row._id}>
-      <td className="osdDocTable__detailsParent" colSpan={columnIds.length + 2}>
+      <td className="osdDocTable__detailsParent" colSpan={columnIds.length + 1}>
         <EuiFlexGroup>
           <EuiFlexItem grow={false}>
             <EuiIcon type="folderOpen" />

From ee23011ae020abe634e095a1c74baa1702baf4d5 Mon Sep 17 00:00:00 2001
From: Miki <miki@amazon.com>
Date: Fri, 2 Feb 2024 10:14:35 -0800
Subject: [PATCH 2/2] Fix overflow problem of detailed doc

Signed-off-by: Miki <miki@amazon.com>
---
 .../components/default_discover_table/_table_cell.scss      | 5 +++++
 .../components/default_discover_table/table_rows.tsx        | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss b/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
index d26fd5e1c56e..c960e87a9477 100644
--- a/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
+++ b/src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
@@ -2,6 +2,11 @@
   border-top: none !important;
 }
 
+// stylelint-disable-next-line @osd/stylelint/no_modifying_global_selectors
+.euiFlexItem.osdDocTable__detailsIconContainer {
+  margin-right: 0;
+}
+
 .osd-table td.osdDocTableCell__toggleDetails {
   padding: 5px 0 0 4px;
 }
diff --git a/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx b/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
index c1e607ac8769..9170d97921d2 100644
--- a/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
+++ b/src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
@@ -132,8 +132,8 @@ export const TableRow = ({
   const expandedTableRow = (
     <tr key={'x' + row._id}>
       <td className="osdDocTable__detailsParent" colSpan={columnIds.length + 1}>
-        <EuiFlexGroup>
-          <EuiFlexItem grow={false}>
+        <EuiFlexGroup gutterSize="m" alignItems="center">
+          <EuiFlexItem grow={false} className="osdDocTable__detailsIconContainer">
             <EuiIcon type="folderOpen" />
           </EuiFlexItem>
           <EuiFlexItem>
@@ -150,7 +150,7 @@ export const TableRow = ({
             <DocViewerLinks hit={row} indexPattern={indexPattern} columns={columns} />
           </EuiFlexItem>
         </EuiFlexGroup>
-        <EuiFlexGroup>
+        <EuiFlexGroup gutterSize="m">
           <EuiFlexItem>
             <DocViewer
               hit={row}