Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
53c9eba
fix(ag-grid-table): remove enterprise features to use community version
amaannawab923 Oct 2, 2025
0762079
Merge branch 'master' of https://github.com/apache/superset
amaannawab923 Oct 3, 2025
49cbbf4
feat: Add frontend streaming CSV export with progress modal
amaannawab923 Oct 3, 2025
2aaf39b
feat: Add testing mode for streaming CSV exports
amaannawab923 Oct 3, 2025
d9d96a4
Streaming progress
amaannawab923 Oct 3, 2025
b78895a
streaming
amaannawab923 Oct 3, 2025
3d00861
use row limit for table from queries response
amaannawab923 Oct 3, 2025
6b2b239
update: Streaming modal refactor
amaannawab923 Oct 4, 2025
9e1625b
update: Refactor hook use streaming export
amaannawab923 Oct 4, 2025
e2419ef
streaming export
amaannawab923 Oct 4, 2025
e67059b
update: correct toast messages
amaannawab923 Oct 4, 2025
c309932
update: remove polling api
amaannawab923 Oct 5, 2025
04bb069
Fix: streaming refactor of row estimation function
amaannawab923 Oct 5, 2025
a71746c
update: Refactor streaming.py
amaannawab923 Oct 6, 2025
869f535
update: Streaming export command
amaannawab923 Oct 6, 2025
843a550
fix: remove unneccessary logic from explore utils
amaannawab923 Oct 6, 2025
c3ea06b
update: Generate file name
amaannawab923 Oct 6, 2025
f320f42
fix: ci cd fixes
amaannawab923 Oct 7, 2025
130f9ba
fix : ui fixes
amaannawab923 Oct 7, 2025
ec5ec0e
update: resolve comments
amaannawab923 Oct 7, 2025
c03c204
fix: formatting
amaannawab923 Oct 7, 2025
a66bf34
fix: filename format
amaannawab923 Oct 7, 2025
0c3e7f5
fix: sqllab streaming integration
amaannawab923 Oct 8, 2025
da789e9
fix: permission for sqllab streaming
amaannawab923 Oct 8, 2025
bbb52dd
fix: retry mechanism in case of error
amaannawab923 Oct 8, 2025
957b796
fix: retry mechanism for chart
amaannawab923 Oct 8, 2025
c6d1838
update: Error message
amaannawab923 Oct 8, 2025
f9a72c8
fix: subsequent csv downloads failures fixed for charts
amaannawab923 Oct 9, 2025
1e97167
Implemented Tests for Streaming Modal ui Component
amaannawab923 Oct 9, 2025
e6f65c4
Formatting fix
amaannawab923 Oct 9, 2025
2371503
fix: eslint
amaannawab923 Oct 9, 2025
3c2efa0
update: hook unit tests
amaannawab923 Oct 10, 2025
096ba4e
fix: eslint error
amaannawab923 Oct 10, 2025
4b49a32
fix result format
amaannawab923 Oct 11, 2025
f27566c
fix: eslint error
amaannawab923 Oct 14, 2025
ca0a51e
fix: comments resolution
amaannawab923 Oct 14, 2025
edcdb20
Unit tests for streaming commands
amaannawab923 Oct 15, 2025
4630a99
Merge branch 'master' of https://github.com/apache/superset into feat…
amaannawab923 Oct 15, 2025
c070c69
Refactor & comments resolution
amaannawab923 Oct 15, 2025
c494c79
fix: refactor and drying up streaming export command with a unified b…
amaannawab923 Oct 15, 2025
bbf1b5e
fix: use csv header instead of custom header from csv streaming api
amaannawab923 Oct 15, 2025
6217791
fix: tests
amaannawab923 Oct 15, 2025
7f55bcf
Refactor Comments Resolution
amaannawab923 Oct 28, 2024
5b2980f
Merge branch 'master' of https://github.com/apache/superset into feat…
amaannawab923 Oct 29, 2025
9aa0c00
fix: import for progress
amaannawab923 Oct 29, 2025
0bf8f39
move filename logic for sqllab to backend
amaannawab923 Oct 29, 2025
316421c
fix: use constant default
amaannawab923 Oct 29, 2025
dbf6b12
Merge branch 'master' of https://github.com/apache/superset into feat…
amaannawab923 Nov 7, 2025
3fba394
ci fix
amaannawab923 Nov 7, 2025
dff377b
using sql row count
amaannawab923 Nov 10, 2025
9a4900a
fix: Streaming works on explore page & Toast appears only after the e…
amaannawab923 Nov 11, 2025
7c9bd3e
ci fix
amaannawab923 Nov 11, 2025
d9d241d
Merge branch 'master' of https://github.com/apache/superset into feat…
amaannawab923 Nov 11, 2025
16e0c82
Rebase and update imports
amaannawab923 Nov 11, 2025
cfb4f49
update: modal title as per figma
amaannawab923 Nov 11, 2025
8848e9f
fix test
amaannawab923 Nov 11, 2025
b5393a4
fix flaky test
amaannawab923 Nov 11, 2025
ed5c1e3
data type fix
amaannawab923 Nov 12, 2025
aba13ff
Merge branch 'master' of https://github.com/apache/superset into feat…
amaannawab923 Nov 13, 2025
c9af828
Comments Resolution
amaannawab923 Nov 18, 2025
fe59a39
Merge branch 'master' of https://github.com/apache/superset into feat…
amaannawab923 Nov 18, 2025
db69437
test fix
amaannawab923 Nov 19, 2025
8090401
test fix
amaannawab923 Nov 19, 2025
dfc23fb
fix sqllab tests
amaannawab923 Nov 19, 2025
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
@@ -0,0 +1,24 @@
/**
* 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 { Progress as AntdProgress } from 'antd';
import type { ProgressProps as AntdProgressProps } from 'antd';

export type ProgressProps = AntdProgressProps;

export const Progress = AntdProgress;
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ export {
} from './ListViewCard';
export { Loading, type LoadingProps } from './Loading';

export { Progress, type ProgressProps } from './Progress';

export { Skeleton, type SkeletonProps } from './Skeleton';

export { Switch, type SwitchProps } from './Switch';
Expand Down
162 changes: 129 additions & 33 deletions superset-frontend/src/SqlLab/components/ResultSet/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ import {
} from 'src/logger/LogUtils';
import { Icons } from '@superset-ui/core/components/Icons';
import { findPermission } from 'src/utils/findPermission';
import { StreamingExportModal } from 'src/components/StreamingExportModal';
import { useStreamingExport } from 'src/components/StreamingExportModal/useStreamingExport';
import { ensureAppRoot } from 'src/utils/pathUtils';
import { useConfirmModal } from 'src/hooks/useConfirmModal';
import ExploreCtasResultsButton from '../ExploreCtasResultsButton';
Expand Down Expand Up @@ -184,6 +186,10 @@ const ResultSet = ({
defaultQueryLimit,
}: ResultSetProps) => {
const user = useSelector(({ user }: SqlLabRootState) => user, shallowEqual);
const streamingThreshold = useSelector(
(state: SqlLabRootState) =>
state.common?.conf?.CSV_STREAMING_ROW_THRESHOLD || 1000,
);
const query = useSelector(
({ sqlLab: { queries } }: SqlLabRootState) =>
pick(queries[queryId], [
Expand Down Expand Up @@ -224,12 +230,21 @@ const ResultSet = ({
const [searchText, setSearchText] = useState('');
const [cachedData, setCachedData] = useState<Record<string, unknown>[]>([]);
const [showSaveDatasetModal, setShowSaveDatasetModal] = useState(false);
const [showStreamingModal, setShowStreamingModal] = useState(false);

const history = useHistory();
const dispatch = useDispatch();
const logAction = useLogAction({ queryId, sqlEditorId: query.sqlEditorId });
const { showConfirm, ConfirmModal } = useConfirmModal();

const { progress, startExport, resetExport, retryExport, cancelExport } =
useStreamingExport({
onComplete: () => {},
onError: error => {
addDangerToast(t('Export failed: %s', error));
},
});

const reRunQueryIfSessionTimeoutErrorOnMount = useCallback(() => {
if (
query.errorMessage &&
Expand Down Expand Up @@ -302,6 +317,28 @@ const ResultSet = ({
const getExportCsvUrl = (clientId: string) =>
ensureAppRoot(`/api/v1/sqllab/export/${clientId}/`);

const handleCloseStreamingModal = () => {
cancelExport();
setShowStreamingModal(false);
resetExport();
};

const shouldUseStreamingExport = () => {
Comment thread
amaannawab923 marked this conversation as resolved.
const { rows, queryLimit, limitingFactor } = query;
const limit = queryLimit || query.results?.query?.limit;
const rowsCount = Math.min(rows || 0, query.results?.data?.length || 0);

let actualRowCount = rowsCount;

if (limitingFactor === LimitingFactor.NotLimited && rows) {
actualRowCount = rows;
} else if (limit) {
actualRowCount = Math.max(actualRowCount, limit);
}

return actualRowCount >= streamingThreshold;
};

const renderControls = () => {
if (search || visualize || csv) {
const { limitingFactor, queryLimit, results, rows } = query;
Expand Down Expand Up @@ -372,9 +409,27 @@ const ResultSet = ({
<CopyStyledButton
buttonSize="small"
buttonStyle="secondary"
href={getExportCsvUrl(query.id)}
{...(!shouldUseStreamingExport() && {
href: getExportCsvUrl(query.id),
})}
data-test="export-csv-button"
onClick={handleDownloadCsv}
onClick={e => {
const useStreaming = shouldUseStreamingExport();

if (useStreaming) {
e.preventDefault();
setShowStreamingModal(true);

startExport({
url: '/api/v1/sqllab/export_streaming/',
payload: { client_id: query.id },
exportType: 'csv',
expectedRows: rows,
});
} else {
handleDownloadCsv(e);
}
}}
>
<Icons.DownloadOutlined iconSize="m" /> {t('Download to CSV')}
</CopyStyledButton>
Expand Down Expand Up @@ -723,43 +778,75 @@ const ResultSet = ({
</AutoSizer>
</div>
</ResultContainer>
<StreamingExportModal
visible={showStreamingModal}
onCancel={handleCloseStreamingModal}
onRetry={retryExport}
progress={progress}
/>
{ConfirmModal}
</>
);
}
if (data && data.length === 0) {
return <Alert type="warning" message={t('The query returned no data')} />;
return (
<>
<Alert type="warning" message={t('The query returned no data')} />
<StreamingExportModal
visible={showStreamingModal}
onCancel={handleCloseStreamingModal}
onRetry={retryExport}
progress={progress}
/>
</>
);
}
}

if (query.cached || (query.state === QueryState.Success && !query.results)) {
if (query.isDataPreview) {
return (
<Button
buttonSize="small"
buttonStyle="primary"
onClick={() =>
dispatch(
reFetchQueryResults({
...query,
isDataPreview: true,
}),
)
}
>
{t('Fetch data preview')}
</Button>
<>
<Button
buttonSize="small"
buttonStyle="primary"
onClick={() =>
dispatch(
reFetchQueryResults({
...query,
isDataPreview: true,
}),
)
}
>
{t('Fetch data preview')}
</Button>
<StreamingExportModal
visible={showStreamingModal}
onCancel={handleCloseStreamingModal}
onRetry={retryExport}
progress={progress}
/>
</>
);
}
if (query.resultsKey) {
return (
<Button
buttonSize="small"
buttonStyle="primary"
onClick={() => fetchResults(query)}
>
{t('Refetch results')}
</Button>
<>
<Button
buttonSize="small"
buttonStyle="primary"
onClick={() => fetchResults(query)}
>
{t('Refetch results')}
</Button>
<StreamingExportModal
visible={showStreamingModal}
onCancel={handleCloseStreamingModal}
onRetry={retryExport}
progress={progress}
/>
</>
);
}
}
Expand All @@ -774,15 +861,24 @@ const ResultSet = ({
const progressMsg = query?.extra?.progress ?? null;

return (
<ResultlessStyles>
<div>{!progressBar && <Loading position="normal" />}</div>
{/* show loading bar whenever progress bar is completed but needs time to render */}
<div>{query.progress === 100 && <Loading position="normal" />}</div>
<QueryStateLabel query={query} />
<div>{progressMsg && <Alert type="success" message={progressMsg} />}</div>
<div>{query.progress !== 100 && progressBar}</div>
{trackingUrl && <div>{trackingUrl}</div>}
</ResultlessStyles>
<>
<ResultlessStyles>
<div>{!progressBar && <Loading position="normal" />}</div>
{/* show loading bar whenever progress bar is completed but needs time to render */}
<div>{query.progress === 100 && <Loading position="normal" />}</div>
<QueryStateLabel query={query} />
<div>
{progressMsg && <Alert type="success" message={progressMsg} />}
</div>
<div>{query.progress !== 100 && progressBar}</div>
{trackingUrl && <div>{trackingUrl}</div>}
</ResultlessStyles>
<StreamingExportModal
visible={showStreamingModal}
onCancel={handleCloseStreamingModal}
progress={progress}
/>
</>
);
};

Expand Down
Loading
Loading