From f6c5b80cca378d46ca88f42d2496fdc36823d8a4 Mon Sep 17 00:00:00 2001
From: Victor Marin <36818606+mdvictor@users.noreply.github.com>
Date: Tue, 7 Nov 2023 11:13:19 +0200
Subject: [PATCH] Table: Fix `no data` message alignment and table selector
 name (#77700)

* on multiple queries show no data message aligned + set a default table name for empty series

* simplify style

* check if there are fields
---
 packages/grafana-data/src/field/fieldState.ts      | 2 +-
 packages/grafana-ui/src/components/Table/Table.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/field/fieldState.ts b/packages/grafana-data/src/field/fieldState.ts
index 55754aa9179..04f1cc5abef 100644
--- a/packages/grafana-data/src/field/fieldState.ts
+++ b/packages/grafana-data/src/field/fieldState.ts
@@ -31,7 +31,7 @@ export function getFrameDisplayName(frame: DataFrame, index?: number) {
   }
 
   // list all the
-  if (index === undefined) {
+  if (index === undefined && frame.fields.length > 0) {
     return frame.fields
       .filter((f) => f.type !== FieldType.time)
       .map((f) => getFieldDisplayName(f, frame))
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 398732e7922..a80f31d5024 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -372,7 +372,7 @@ export const Table = memo((props: Props) => {
               </CustomScrollbar>
             </div>
           ) : (
-            <div style={{ height: height - headerHeight }} className={tableStyles.noData}>
+            <div style={{ height: height - headerHeight, width }} className={tableStyles.noData}>
               No data
             </div>
           )}