diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx b/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx index bbae677ffe8c4..6820e19d49deb 100644 --- a/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx +++ b/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx @@ -61,7 +61,7 @@ const QueryHistory = ({ 'progress', 'rows', 'sql', - 'output', + 'results', 'actions', ]} queries={queries} diff --git a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx index f3f212c1b8e11..dffb65a1f1072 100644 --- a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx +++ b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx @@ -35,10 +35,12 @@ import ResultSet from '../ResultSet'; import HighlightedSql from '../HighlightedSql'; import { StaticPosition, verticalAlign, StyledTooltip } from './styles'; -interface QueryTableQuery extends Omit { +interface QueryTableQuery + extends Omit { state?: Record; sql?: Record; progress?: Record; + results?: Record; } interface QueryTableProps { @@ -227,12 +229,12 @@ const QueryTable = ({ ); if (q.resultsKey) { - q.output = ( + q.results = ( - {t('View results')} + {t('View')} } modalTitle={t('Data preview')} @@ -252,13 +254,8 @@ const QueryTable = ({ responsive /> ); - } else { - // if query was run using ctas and force_ctas_schema was set - // tempTable will have the schema - const schemaUsed = - q.ctas && q.tempTable && q.tempTable.includes('.') ? '' : q.schema; - q.output = [schemaUsed, q.tempTable].filter(v => v).join('.'); } + q.progress = state === 'success' ? (