fix(plugin-chart-table): hide cell bar for group by fields (#957)

apache · Nov 26, 2021 · eb16861 · eb16861
1 parent d142881
commit eb16861
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx b/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/TableChart.tsx
@@ -146,6 +146,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
     height,
     width,
     data,
+    isRawRecords,
     columns: columnsMeta,
     alignPositiveNegative = false,
     colorPositiveNegative = false,
@@ -205,14 +206,14 @@ export default function TableChart<D extends DataRecord = DataRecord>(
 
   const getColumnConfigs = useCallback(
     (column: DataColumnMeta, i: number): ColumnWithLooseAccessor<D> => {
-      const { key, label, dataType } = column;
+      const { key, label, dataType, isMetric } = column;
       let className = '';
       if (dataType === GenericDataType.NUMERIC) {
         className += ' dt-metric';
       } else if (emitFilter) {
         className += ' dt-is-filter';
       }
-      const valueRange = showCellBars && getValueRange(key);
+      const valueRange = showCellBars && (isMetric || isRawRecords) && getValueRange(key);
       return {
         id: String(i), // to allow duplicate column keys
         // must use custom accessor to allow `.` in column names

diff --git a/...ontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/transformProps.ts b/...ontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/transformProps.ts
@@ -28,6 +28,7 @@ import {
   TimeFormats,
   GenericDataType,
   getMetricLabel,
+  QueryMode,
 } from '@superset-ui/core';
 
 import isEqualColumns from './utils/isEqualColumns';
@@ -136,6 +137,8 @@ const processColumns = memoizeOne(function processColumns(props: TableChartProps
         key,
         label,
         dataType,
+        isMetric,
+        isPercentMetric,
         formatter,
       };
     });
@@ -183,6 +186,7 @@ export default function transformProps(chartProps: TableChartProps): TableChartT
     page_length: pageSize,
     table_filter: tableFilter,
     order_desc: sortDesc = false,
+    query_mode: queryMode,
   } = formData;
 
   const [metrics, percentMetrics, columns] = processColumns(chartProps);
@@ -191,6 +195,7 @@ export default function transformProps(chartProps: TableChartProps): TableChartT
   return {
     height,
     width,
+    isRawRecords: queryMode === QueryMode.raw,
     data,
     columns,
     metrics,

diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/types.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/types.ts
@@ -40,6 +40,8 @@ export interface DataColumnMeta {
   label: string;
   dataType: GenericDataType;
   formatter?: TimeFormatter | NumberFormatter | CustomFormatter;
+  isMetric?: boolean;
+  isPercentMetric?: boolean;
 }
 
 export interface TableChartData {
@@ -74,6 +76,7 @@ export interface TableChartProps extends ChartProps {
 export interface TableChartTransformedProps<D extends DataRecord = DataRecord> {
   height: number;
   width: number;
+  isRawRecords?: boolean;
   data: D[];
   columns: DataColumnMeta[];
   metrics?: (keyof D)[];