Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export function Timer({
status = 'success',
}: TimerProps) {
const theme = useTheme();
const [clockStr, setClockStr] = useState('00:00:00.00');
const [clockStr, setClockStr] = useState(
startTime && endTime ? fDuration(startTime, endTime) : '00:00:00.00',
);
const timer = useRef<ReturnType<typeof setInterval>>();

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ export type Query = {
errorMessage: string | null;
extra: {
progress: string | null;
progress_text?: string;
errors?: SupersetError[];
};
id: string;
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/SqlLab/actions/sqlLab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ export function startQuery(query: Query, runPreviewOnly?: boolean) {
id: query.id ? query.id : nanoid(11),
progress: 0,
startDttm: now(),
state: query.runAsync ? 'pending' : 'running',
state: 'pending',
cached: false,
});
return { type: START_QUERY, query, runPreviewOnly } as const;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import { isValidElement } from 'react';
import { render, screen } from 'spec/helpers/testing-library';
import { QueryState, type QueryResponse } from '@superset-ui/core';
import QueryStatusBar from '.';

jest.mock('../QueryStateLabel', () => ({
__esModule: true,
default: ({ query }: { query: { state: QueryState } }) => (
<div data-test="query-state-label">{query.state}</div>
),
}));

const createMockQuery = (
overrides: Partial<QueryResponse> = {},
): QueryResponse =>
({
id: 'test-query-id',
dbId: 1,
sql: 'SELECT * FROM test',
sqlEditorId: 'test-editor',
tab: 'Test Tab',
ctas: false,
cached: false,
progress: 0,
startDttm: Date.now() - 1000,
endDttm: undefined,
state: QueryState.Running,
tempSchema: null,
tempTable: null,
userId: 1,
executedSql: null,
rows: 0,
queryLimit: 100,
catalog: null,
schema: 'test_schema',
errorMessage: null,
extra: {},
results: undefined,
...overrides,
}) as QueryResponse;

test('is valid element', () => {
const query = createMockQuery();
expect(isValidElement(<QueryStatusBar query={query} />)).toBe(true);
});

test('renders query state label', () => {
const query = createMockQuery({ state: QueryState.Running });
render(<QueryStatusBar query={query} />);
expect(screen.getByTestId('query-state-label')).toBeInTheDocument();
expect(screen.getByText('Query State:')).toBeInTheDocument();
});

test('renders elapsed time section', () => {
const query = createMockQuery({ state: QueryState.Running });
render(<QueryStatusBar query={query} />);
expect(screen.getByText('Elapsed:')).toBeInTheDocument();
});

test('renders steps for running query', () => {
const query = createMockQuery({ state: QueryState.Running, progress: 50 });
render(<QueryStatusBar query={query} />);
expect(screen.getByText('Validate query')).toBeInTheDocument();
expect(screen.getByText('Connect to engine')).toBeInTheDocument();
expect(screen.getByText('Running')).toBeInTheDocument();
expect(screen.getByText('Download to client')).toBeInTheDocument();
expect(screen.getByText('Finish')).toBeInTheDocument();
});

test('renders steps for pending query', () => {
const query = createMockQuery({ state: QueryState.Pending });
render(<QueryStatusBar query={query} />);
expect(screen.getByText('Validate query')).toBeInTheDocument();
});

test('returns null when query is successful with results', () => {
const query = createMockQuery({
state: QueryState.Success,
results: {
displayLimitReached: false,
columns: [],
selected_columns: [],
expanded_columns: [],
data: [],
query: { limit: 100 },
},
});
const { container } = render(<QueryStatusBar query={query} />);
expect(container).toBeEmptyDOMElement();
});

test('displays progress percentage when available', () => {
const query = createMockQuery({
state: QueryState.Running,
progress: 75,
});
render(<QueryStatusBar query={query} />);
expect(screen.getByText('(75%)')).toBeInTheDocument();
});

test('displays progress text when available', () => {
const query = createMockQuery({
state: QueryState.Running,
progress: 50,
extra: { progress: null, progress_text: 'Processing rows' },
});
render(<QueryStatusBar query={query} />);
expect(screen.getByText('(50%, Processing rows)')).toBeInTheDocument();
});

test('displays only progress text when no percentage', () => {
const query = createMockQuery({
state: QueryState.Running,
progress: 0,
extra: { progress: null, progress_text: 'Initializing' },
});
render(<QueryStatusBar query={query} />);
expect(screen.getByText('(Initializing)')).toBeInTheDocument();
});

test('renders for failed query state', () => {
const query = createMockQuery({
state: QueryState.Failed,
errorMessage: 'Query failed',
});
render(<QueryStatusBar query={query} />);
expect(screen.getByTestId('query-state-label')).toBeInTheDocument();
});

test('renders for stopped query state', () => {
const query = createMockQuery({ state: QueryState.Stopped });
render(<QueryStatusBar query={query} />);
expect(screen.getByTestId('query-state-label')).toBeInTheDocument();
});

test('renders for fetching state', () => {
const query = createMockQuery({
state: QueryState.Fetching,
progress: 100,
});
render(<QueryStatusBar query={query} />);
expect(screen.getByText('Download to client')).toBeInTheDocument();
});
Loading
Loading