From 89bd772b00874e11ee7ae66da62fd6c6ff28c8ea Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 9 Dec 2021 13:05:51 -0700
Subject: [PATCH] Show empty state only when done loading

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/beige-mangos-knock.md                             | 5 +++++
 .../src/components/WorkflowRunsTable/WorkflowRunsTable.tsx   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/beige-mangos-knock.md

diff --git a/.changeset/beige-mangos-knock.md b/.changeset/beige-mangos-knock.md
new file mode 100644
index 0000000000..d8723c3f87
--- /dev/null
+++ b/.changeset/beige-mangos-knock.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-actions': patch
+---
+
+Show empty state only when workflow API call has completed
diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index 2506613e0c..81fa036221 100644
--- a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -172,8 +172,9 @@ export const WorkflowRunsTable = ({
     });
 
   const githubHost = hostname || 'github.com';
+  const hasNoRuns = !loading && !tableProps.loading && !runs;
 
-  return !runs ? (
+  return hasNoRuns ? (
     <EmptyState
       missing="data"
       title="No Workflow Data"