Show expanded columns in gray in SQL Editor (#7627)

* Show expanded columns in gray * Remove payload mocking * Remove empty line * Safety fallback if expanded_columns is not in the payload * Fix typo
apache · May 31, 2019 · d408e30 · d408e30
1 parent c1712e5
commit d408e30
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/superset/assets/src/SqlLab/components/ResultSet.jsx b/superset/assets/src/SqlLab/components/ResultSet.jsx
@@ -207,6 +207,9 @@ export default class ResultSet extends React.PureComponent {
         data = results.data;
       }
       if (data && data.length > 0) {
+        const expandedColumns = results.expanded_columns
+          ? results.expanded_columns.map(col => col.name)
+          : [];
         return (
           <React.Fragment>
             {this.renderControls.bind(this)()}
@@ -216,6 +219,7 @@ export default class ResultSet extends React.PureComponent {
               orderedColumnKeys={results.columns.map(col => col.name)}
               height={height}
               filterText={this.state.searchText}
+              expandedColumns={expandedColumns}
             />
           </React.Fragment>
         );

diff --git a/superset/assets/src/components/FilterableTable/FilterableTable.jsx b/superset/assets/src/components/FilterableTable/FilterableTable.jsx
@@ -44,6 +44,7 @@ const propTypes = {
   overscanRowCount: PropTypes.number,
   rowHeight: PropTypes.number,
   striped: PropTypes.bool,
+  expandedColumns: PropTypes.array,
 };
 
 const defaultProps = {
@@ -52,6 +53,7 @@ const defaultProps = {
   overscanRowCount: 10,
   rowHeight: 32,
   striped: true,
+  expandedColumns: [],
 };
 
 export default class FilterableTable extends PureComponent {
@@ -141,7 +143,15 @@ export default class FilterableTable extends PureComponent {
     return (
       <TooltipWrapper label="header" tooltip={label}>
         <div className="header-style">
-          {label}
+          <span
+            className={
+              this.props.expandedColumns.indexOf(label) > -1
+                ? 'header-style-disabled'
+                : ''
+            }
+          >
+            {label}
+          </span>
           {sortBy === dataKey &&
             <SortIndicator sortDirection={sortDirection} />
           }

diff --git a/superset/assets/src/components/FilterableTable/FilterableTableStyles.css b/superset/assets/src/components/FilterableTable/FilterableTableStyles.css
@@ -76,4 +76,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-}
+}
+.header-style-disabled {
+  color: #aaa;
+}