From 4db92492cf11e082308171cfe428f03000db39bb Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Thu, 18 Feb 2021 11:36:57 +0100
Subject: [PATCH] fix(legacy-plugin-chart-paired-t-test): fix paired t-test
 table chart (#961)

* fix(legacy-plugin-chart-paired-t-test): fix paired t-test table chart

* Display error message if group by wasn't defined

* Add validateNonEmpty for groupby
---
 .../legacy-plugin-chart-paired-t-test/package.json       | 2 +-
 .../src/PairedTTest.jsx                                  | 2 +-
 .../legacy-plugin-chart-paired-t-test/src/TTestTable.jsx | 7 ++++++-
 .../src/controlPanel.ts                                  | 9 ++++++++-
 .../src/transformProps.js                                | 2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/package.json
index 1a2434c079d5..3e9ca27bf5d0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/package.json
@@ -32,7 +32,7 @@
     "@superset-ui/core": "0.17.9",
     "distributions": "^1.0.0",
     "prop-types": "^15.6.2",
-    "reactable-arc": "0.15.0"
+    "reactable": "^1.1.0"
   },
   "peerDependencies": {
     "react": "^15 || ^16"
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
index 2486edbccca1..59efb796fd99 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/PairedTTest.jsx
@@ -45,7 +45,7 @@ class PairedTTest extends React.PureComponent {
 
     return (
       <div className={`superset-legacy-chart-paired-t-test ${className}`}>
-        <div className="paired-ttest-table scrollbar-container">
+        <div className="paired-ttest-table">
           <div className="scrollbar-content">
             {metrics.map((metric, i) => (
               <TTestTable
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx
index 086b285f876d..a7e9eb0bc6a1 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/TTestTable.jsx
@@ -19,7 +19,7 @@
 /* eslint-disable react/no-array-index-key, react/jsx-no-bind */
 import dist from 'distributions';
 import React from 'react';
-import { Table, Tr, Td, Thead, Th } from 'reactable-arc';
+import { Table, Tr, Td, Thead, Th } from 'reactable';
 import PropTypes from 'prop-types';
 
 export const dataPropType = PropTypes.arrayOf(
@@ -166,6 +166,11 @@ class TTestTable extends React.Component {
   render() {
     const { data, metric, groups } = this.props;
     const { control, liftValues, pValues } = this.state;
+
+    if (!Array.isArray(groups) || groups.length === 0) {
+      throw Error('Group by param is required');
+    }
+
     // Render column header for each group
     const columns = groups.map((group, i) => (
       <Th key={i} column={group}>
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts
index 1f2803fd2b60..c08456c4aca0 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
+import { t, validateNonEmpty } from '@superset-ui/core';
 import { ControlPanelConfig, sections } from '@superset-ui/chart-controls';
 
 const config: ControlPanelConfig = {
@@ -49,6 +49,13 @@ const config: ControlPanelConfig = {
               description: t('Compute the contribution to the total'),
             },
           },
+
+          {
+            name: 'groupby',
+            override: {
+              validators: [validateNonEmpty],
+            },
+          },
         ],
         ['row_limit', null],
       ],
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js
index e00e8076ea1f..1cd3d3bf7785 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/src/transformProps.js
@@ -25,7 +25,7 @@ export default function transformProps(chartProps) {
     data: queriesData[0].data,
     groups: groupby,
     liftValPrec: parseInt(liftvaluePrecision, 10),
-    metrics,
+    metrics: metrics.map(metric => (typeof metric === 'string' ? metric : metric.label)),
     pValPrec: parseInt(pvaluePrecision, 10),
   };
 }