From 87f96380aa0027296176e5dff7f3d4afa778cd2a Mon Sep 17 00:00:00 2001
From: David Palmer <david.palmer@adscale.co.nz>
Date: Thu, 25 Aug 2022 15:36:19 +1200
Subject: [PATCH] fix broken auto-refresh

In PR #25042 the merged change included a bug that prevents the page
from auto-refreshing if there are anything other than manual runs on the
page. We also want to auto-refresh for scheduled runs.

I've also added more complete unit tests for the expected behaviour.
---
 airflow/www/static/js/api/useGridData.test.js | 18 ++++++++++++++++++
 airflow/www/static/js/api/useGridData.ts      |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/airflow/www/static/js/api/useGridData.test.js b/airflow/www/static/js/api/useGridData.test.js
index f8c7d451c6c2b..d6e7a5b68a1f4 100644
--- a/airflow/www/static/js/api/useGridData.test.js
+++ b/airflow/www/static/js/api/useGridData.test.js
@@ -60,6 +60,24 @@ describe('Test areActiveRuns()', () => {
     expect(result).toBe(false);
   });
 
+  [
+    { runType: 'manual', state: 'queued', result: true },
+    { runType: 'manual', state: 'running', result: true },
+    { runType: 'scheduled', state: 'queued', result: true },
+    { runType: 'scheduled', state: 'running', result: true },
+    { runType: 'backfill', state: 'queued', result: false },
+    { runType: 'backfill', state: 'running', result: false },
+  ].forEach((conf) => {
+    test(`Returns ${conf.result} when filtering runs with runtype ["${conf.runType}"] and state ["${conf.state}"]`, () => {
+      const runConf = { ...conf };
+      delete runConf.result;
+      const runs = [runConf];
+
+      const result = areActiveRuns(runs);
+      expect(result).toBe(conf.result);
+    });
+  });
+
   test('Returns false when there are no runs', () => {
     const result = areActiveRuns();
     expect(result).toBe(false);
diff --git a/airflow/www/static/js/api/useGridData.ts b/airflow/www/static/js/api/useGridData.ts
index 2e2ca1cb950c1..d24a4186701bf 100644
--- a/airflow/www/static/js/api/useGridData.ts
+++ b/airflow/www/static/js/api/useGridData.ts
@@ -57,7 +57,7 @@ const formatOrdering = (data: GridData) => ({
   ordering: data.ordering.map((o: string) => camelCase(o)) as RunOrdering,
 });
 
-export const areActiveRuns = (runs: DagRun[] = []) => runs.filter((run) => ['manual', 'manual'].includes(run.runType)).filter((run) => ['queued', 'running', 'scheduled'].includes(run.state)).length > 0;
+export const areActiveRuns = (runs: DagRun[] = []) => runs.filter((run) => ['manual', 'scheduled'].includes(run.runType)).filter((run) => ['queued', 'running', 'scheduled'].includes(run.state)).length > 0;
 
 const useGridData = () => {
   const { isRefreshOn, stopRefresh } = useAutoRefresh();