Clean up the code

apache · Dec 17, 2021 · e18bfdc · e18bfdc
1 parent df2c239
commit e18bfdc
Show file tree

Hide file tree

Showing 3 changed files with 748 additions and 792 deletions.
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -363,7 +363,6 @@ export default function PivotTableChart(props: PivotTableProps) {
           customFormatters={metricFormatters}
           aggregatorName={aggregateFunction}
           vals={vals}
-          rendererName="Table With Subtotal"
           colOrder={colOrder}
           rowOrder={rowOrder}
           sorters={sorters}

diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.jsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/PivotTable.jsx
@@ -18,32 +18,16 @@
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { PivotData } from './utilities';
-import { TableRenderers } from './TableRenderers';
+import { TableRenderer } from './TableRenderers';
 
 class PivotTable extends React.PureComponent {
   render() {
-    const Renderer =
-      this.props.renderers[
-        this.props.rendererName in this.props.renderers
-          ? this.props.rendererName
-          : Object.keys(this.props.renderers)[0]
-      ];
-    return <Renderer {...this.props} />;
+    return <TableRenderer {...this.props} />;
   }
 }
 
-PivotTable.propTypes = {
-  ...PivotData.propTypes,
-  rendererName: PropTypes.string,
-  renderers: PropTypes.objectOf(PropTypes.func),
-};
-
-PivotTable.defaultProps = {
-  ...PivotData.defaultProps,
-  rendererName: 'Table',
-  renderers: TableRenderers,
-};
+PivotTable.propTypes = PivotData.propTypes;
+PivotTable.defaultProps = PivotData.defaultProps;
 
 export default PivotTable;