[superset] branch master updated: fix(sql lab): replace the output column in the query history table (#19370)

[rusackas]

This is an automated email from the ASF dual-hosted git repository.

rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new d4e7c65f6a fix(sql lab): replace the output column in the query 
history table (#19370)
d4e7c65f6a is described below

commit d4e7c65f6abc656625d827af362d2b6b0d0e1877
Author: Diego Medina <diegomedin...@gmail.com>
AuthorDate: Wed Apr 13 12:22:03 2022 -0400

    fix(sql lab): replace the output column in the query history table (#19370)
    
    * fix(sql lab): replace the output column in the query history table
    
    * improvements
---
 .../src/SqlLab/components/QueryHistory/index.tsx          |  2 +-
 .../src/SqlLab/components/QueryTable/index.tsx            | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx 
b/superset-frontend/src/SqlLab/components/QueryHistory/index.tsx
index bbae677ffe..6820e19d49 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 f3f212c1b8..dffb65a1f1 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<Query, 'state' | 'sql' | 'progress'> {
+interface QueryTableQuery
+  extends Omit<Query, 'state' | 'sql' | 'progress' | 'results'> {
   state?: Record<string, any>;
   sql?: Record<string, any>;
   progress?: Record<string, any>;
+  results?: Record<string, any>;
 }
 
 interface QueryTableProps {
@@ -227,12 +229,12 @@ const QueryTable = ({
           </Card>
         );
         if (q.resultsKey) {
-          q.output = (
+          q.results = (
             <ModalTrigger
               className="ResultsModal"
               triggerNode={
                 <Label type="info" className="pointer">
-                  {t('View results')}
+                  {t('View')}
                 </Label>
               }
               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' ? (
             <ProgressBar