fix(plugin-chart-pivot-table): fix displaying column labels (apache#1132

)
zhaoyongjie · Nov 25, 2021 · 63df854 · 63df854
1 parent 4791bf9
commit 63df854
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/package.json b/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@superset-ui/chart-controls": "0.17.50",
     "@superset-ui/core": "0.17.50",
-    "@superset-ui/react-pivottable": "^0.12.6"
+    "@superset-ui/react-pivottable": "^0.12.8"
   },
   "peerDependencies": {
     "react": "^16.13.1"

diff --git a/...emporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/...emporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -56,6 +56,7 @@ export default function PivotTableChart(props: PivotTableProps) {
     emitFilter,
     setDataMask,
     selectedFilters,
+    verboseMap,
   } = props;
 
   const adaptiveFormatter = getNumberFormatter(valueFormat);
@@ -202,6 +203,7 @@ export default function PivotTableChart(props: PivotTableProps) {
           colSubtotalDisplay: { displayOnTop: colSubtotalPosition },
           rowSubtotalDisplay: { displayOnTop: rowSubtotalPosition },
         }}
+        namesMapping={verboseMap}
       />
     </Styles>
   );

diff --git a/...ary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts b/...ary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts
@@ -55,6 +55,7 @@ export default function transformProps(chartProps: ChartProps) {
     formData,
     hooks: { setDataMask = () => {} },
     filterState,
+    datasource: { verboseMap = {} },
   } = chartProps;
   const data = queriesData[0].data as DataRecord[];
   const {
@@ -95,5 +96,6 @@ export default function transformProps(chartProps: ChartProps) {
     emitFilter,
     setDataMask,
     selectedFilters,
+    verboseMap,
   };
 }
diff --git a/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/types.ts b/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/types.ts
@@ -22,6 +22,7 @@ import {
   AdhocMetric,
   SetDataMaskHook,
   DataRecordValue,
+  JsonObject,
 } from '@superset-ui/core';
 
 export interface PivotTableStylesProps {
@@ -49,6 +50,7 @@ interface PivotTableCustomizeProps {
   setDataMask: SetDataMaskHook;
   emitFilter?: boolean;
   selectedFilters?: SelectedFiltersType;
+  verboseMap?: JsonObject;
 }
 
 export type PivotTableQueryFormData = QueryFormData &

diff --git a/...perset_ui/superset-ui/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts b/...perset_ui/superset-ui/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts
@@ -30,6 +30,7 @@ describe('PivotTableChart transformProps', () => {
     ],
     hooks: { setDataMask },
     filterState: { selectedFilters: {} },
+    datasource: { verboseMap: {} },
   });
 
   it('should transform chart props for viz', () => {
@@ -53,6 +54,7 @@ describe('PivotTableChart transformProps', () => {
       emitFilter: false,
       setDataMask,
       selectedFilters: {},
+      verboseMap: {},
     });
   });
 });