Skip to content

Revert "No grid auto-refresh for backfill dag runs (#25042)" #26463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbovenzi merged 2 commits into from
Sep 21, 2022
Merged

Revert "No grid auto-refresh for backfill dag runs (#25042)" #26463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25fa2c4
Revert "No grid auto-refresh for backfill dag runs (#25042)"
Gollum999 Sep 18, 2022
25beb70
Fix Grid unit test
Gollum999 Sep 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 6 additions & 58 deletions airflow/www/static/js/api/useGridData.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const commonDagRunParams = {
executionDate: '2022-01-01T10:00+00:00',
dataIntervalStart: '2022-01-01T05:00+00:00',
dataIntervalEnd: '2022-01-01T10:00+00:00',
runType: 'scheduled' as DagRun['runType'],
startDate: null,
endDate: null,
lastSchedulingDecision: null,
Expand All @@ -35,75 +36,22 @@ const commonDagRunParams = {
describe('Test areActiveRuns()', () => {
test('Correctly detects active runs', () => {
const runs: DagRun[] = [
{ runType: 'scheduled', state: 'success', ...commonDagRunParams },
{ runType: 'manual', state: 'queued', ...commonDagRunParams },
{ state: 'success', ...commonDagRunParams },
{ state: 'queued', ...commonDagRunParams },
];
expect(areActiveRuns(runs)).toBe(true);
});

test('Returns false when all runs are resolved', () => {
const runs: DagRun[] = [
{ runType: 'scheduled', state: 'success', ...commonDagRunParams },
{ runType: 'manual', state: 'failed', ...commonDagRunParams },
{ runType: 'manual', state: 'failed', ...commonDagRunParams },
{ state: 'success', ...commonDagRunParams },
{ state: 'failed', ...commonDagRunParams },
{ state: 'failed', ...commonDagRunParams },
];
const result = areActiveRuns(runs);
expect(result).toBe(false);
});

test('Returns false when filtering runs runtype ["backfill"]', () => {
const runs: DagRun[] = [
{ runType: 'scheduled', state: 'success', ...commonDagRunParams },
{ runType: 'manual', state: 'failed', ...commonDagRunParams },
{ runType: 'backfill', state: 'failed', ...commonDagRunParams },
];
const result = areActiveRuns(runs);
expect(result).toBe(false);
});

test('Returns false when filtering runs runtype ["backfill"] and state ["queued"]', () => {
const runs: DagRun[] = [
{ runType: 'scheduled', state: 'success', ...commonDagRunParams },
{ runType: 'manual', state: 'failed', ...commonDagRunParams },
{ runType: 'backfill', state: 'queued', ...commonDagRunParams },
];
const result = areActiveRuns(runs);
expect(result).toBe(false);
});

[
{
runType: 'manual', state: 'queued', expectedResult: true,
},
{
runType: 'manual', state: 'running', expectedResult: true,
},
{
runType: 'scheduled', state: 'queued', expectedResult: true,
},
{
runType: 'scheduled', state: 'running', expectedResult: true,
},
{
runType: 'dataset_triggered', state: 'queued', expectedResult: true,
},
{
runType: 'dataset_triggered', state: 'running', expectedResult: true,
},
{
runType: 'backfill', state: 'queued', expectedResult: false,
},
{
runType: 'backfill', state: 'running', expectedResult: false,
},
].forEach(({ state, runType, expectedResult }) => {
test(`Returns ${expectedResult} when filtering runs with runtype ["${runType}"] and state ["${state}"]`, () => {
const runs: DagRun[] = [{ runType, state, ...commonDagRunParams } as DagRun];
const result = areActiveRuns(runs);
expect(result).toBe(expectedResult);
});
});

test('Returns false when there are no runs', () => {
const result = areActiveRuns();
expect(result).toBe(false);
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/static/js/api/useGridData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', 'scheduled', 'dataset_triggered'].includes(run.runType)).filter((run) => ['queued', 'running'].includes(run.state)).length > 0;
export const areActiveRuns = (runs: DagRun[] = []) => runs.filter((run) => ['queued', 'running'].includes(run.state)).length > 0;

const useGridData = () => {
const { isRefreshOn, stopRefresh } = useAutoRefresh();
Expand Down