diff --git a/ui/lib/apps/Statement/utils/useStatementTableController.ts b/ui/lib/apps/Statement/utils/useStatementTableController.ts
index 3b9fd70626..5a1df1eebc 100644
--- a/ui/lib/apps/Statement/utils/useStatementTableController.ts
+++ b/ui/lib/apps/Statement/utils/useStatementTableController.ts
@@ -28,7 +28,6 @@ export const DEF_STMT_COLUMN_KEYS: IColumnKeys = {
avg_latency: true,
exec_count: true,
plan_count: true,
- related_schemas: true,
}
const QUERY_OPTIONS = 'statement.query_options'
diff --git a/ui/lib/components/BaseSelect/index.tsx b/ui/lib/components/BaseSelect/index.tsx
index cc64fc3b5a..6901b5c7b0 100644
--- a/ui/lib/components/BaseSelect/index.tsx
+++ b/ui/lib/components/BaseSelect/index.tsx
@@ -214,7 +214,6 @@ function BaseSelect
({
onKeyDown={handleContainerKeyDown}
ref={containerRef}
{...restProps}
- data-e2e="base_selector"
>
({
tabIndex={tabIndex}
autoFocus={autoFocus}
readOnly
- data-e2e="base_select_input"
/>
-
+
{displayAsPlaceholder ? placeholder : renderedValue}
diff --git a/ui/lib/components/CardTable/index.tsx b/ui/lib/components/CardTable/index.tsx
index 735770eb89..d12c34a6b3 100644
--- a/ui/lib/components/CardTable/index.tsx
+++ b/ui/lib/components/CardTable/index.tsx
@@ -245,6 +245,7 @@ export default function CardTable(props: ICardTableProps) {
noMarginTop={cardNoMarginTop}
noMarginBottom={cardNoMarginBottom}
extra={cardExtra}
+ {...restProps}
>
{t('component.columnsSelector.select')}
@@ -112,7 +112,7 @@ export default function ColumnsSelector({
diff --git a/ui/lib/components/Expand/index.tsx b/ui/lib/components/Expand/index.tsx
index 853af5ce85..65ac41c2bc 100644
--- a/ui/lib/components/Expand/index.tsx
+++ b/ui/lib/components/Expand/index.tsx
@@ -11,7 +11,7 @@ export interface IExpandProps {
function Expand({ collapsedContent, children, expanded }: IExpandProps) {
// FIXME: Animations
return (
-
+
{expanded ? children : collapsedContent ?? children}
)
diff --git a/ui/lib/utils/tableColumnFactory.tsx b/ui/lib/utils/tableColumnFactory.tsx
index 81486003f9..803fd73cc0 100644
--- a/ui/lib/utils/tableColumnFactory.tsx
+++ b/ui/lib/utils/tableColumnFactory.tsx
@@ -235,7 +235,7 @@ export class TableColumnFactory {
isMultiline: showFullSQL,
onRender: (rec: U) =>
showFullSQL ? (
-
+
) : (
@@ -243,7 +243,7 @@ export class TableColumnFactory {
title={}
placement="right"
>
-
+