From fa4364f712643d1903216c25fcfe9f15b19e4548 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Wed, 20 May 2020 15:01:43 -0700 Subject: [PATCH 1/2] cherry pick --- superset-frontend/package.json | 2 +- .../src/explore/controlPanels/PairedTtest.js | 101 ------------------ superset-frontend/src/setup/setupPlugins.ts | 2 - 3 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 superset-frontend/src/explore/controlPanels/PairedTtest.js diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 74f422b61069..c177fa5509cc 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -77,7 +77,7 @@ "@superset-ui/legacy-plugin-chart-iframe": "^0.13.16", "@superset-ui/legacy-plugin-chart-map-box": "^0.13.16", "@superset-ui/legacy-plugin-chart-markup": "^0.13.12", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.13.5", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.13.21", "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.13.20", "@superset-ui/legacy-plugin-chart-partition": "^0.13.11", "@superset-ui/legacy-plugin-chart-pivot-table": "^0.13.10", diff --git a/superset-frontend/src/explore/controlPanels/PairedTtest.js b/superset-frontend/src/explore/controlPanels/PairedTtest.js deleted file mode 100644 index 27b605f5bea9..000000000000 --- a/superset-frontend/src/explore/controlPanels/PairedTtest.js +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import { t } from '@superset-ui/translation'; - -export default { - requiresTime: true, - controlPanelSections: [ - { - label: t('Query'), - expanded: true, - controlSetRows: [ - ['metrics'], - ['adhoc_filters'], - ['groupby'], - ['limit', 'timeseries_limit_metric'], - [ - { - name: 'order_desc', - config: { - type: 'CheckboxControl', - label: t('Sort Descending'), - default: true, - description: t('Whether to sort descending or ascending'), - }, - }, - { - name: 'contribution', - config: { - type: 'CheckboxControl', - label: t('Contribution'), - default: false, - description: t('Compute the contribution to the total'), - }, - }, - ], - ['row_limit', null], - ], - }, - { - label: t('Paired t-test'), - expanded: false, - controlSetRows: [ - [ - { - name: 'significance_level', - config: { - type: 'TextControl', - label: t('Significance Level'), - default: 0.05, - description: t( - 'Threshold alpha level for determining significance', - ), - }, - }, - ], - [ - { - name: 'pvalue_precision', - config: { - type: 'TextControl', - label: t('p-value precision'), - default: 6, - description: t( - 'Number of decimal places with which to display p-values', - ), - }, - }, - ], - [ - { - name: 'liftvalue_precision', - config: { - type: 'TextControl', - label: t('Lift percent precision'), - default: 4, - description: t( - 'Number of decimal places with which to display lift values', - ), - }, - }, - ], - ], - }, - ], -}; diff --git a/superset-frontend/src/setup/setupPlugins.ts b/superset-frontend/src/setup/setupPlugins.ts index 1162e4783812..899be1e18d67 100644 --- a/superset-frontend/src/setup/setupPlugins.ts +++ b/superset-frontend/src/setup/setupPlugins.ts @@ -32,7 +32,6 @@ import DeckScatter from '../explore/controlPanels/DeckScatter'; import DeckScreengrid from '../explore/controlPanels/DeckScreengrid'; import EventFlow from '../explore/controlPanels/EventFlow'; import FilterBox from '../explore/controlPanels/FilterBox'; -import PairedTtest from '../explore/controlPanels/PairedTtest'; import Separator from '../explore/controlPanels/Separator'; import TimeTable from '../explore/controlPanels/TimeTable'; @@ -44,7 +43,6 @@ export default function setupPlugins() { .registerValue('country_map', CountryMap) .registerValue('event_flow', EventFlow) .registerValue('filter_box', FilterBox) - .registerValue('paired_ttest', PairedTtest) .registerValue('separator', Separator) .registerValue('time_table', TimeTable) .registerValue('deck_arc', DeckArc) From c282cb0f931b134e1a0f5ce3a83abd20d5bfae64 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Tue, 26 May 2020 13:42:50 -0700 Subject: [PATCH 2/2] update package --- superset-frontend/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 7b74b656ec17..012d2469b6e7 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -6823,9 +6823,9 @@ } }, "@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.13.5.tgz", - "integrity": "sha512-Rj6Sd4q3gw8KfJgG4kYf/4TI7of+3a8TkbcDD5PJKXWprfNhIMdUcu6GphEw1t0JdIUbGw+1Zs401kizhFAggQ==", + "version": "0.13.21", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.13.21.tgz", + "integrity": "sha512-j1trQdA1/QGCttTqsG93tFwrK01EMX4hJtwkzYPvuNGV80Q/iK3TDSy82mB6Mt9SzKHakm4jq+KUWKlpkez5pg==", "requires": { "distributions": "^1.0.0", "prop-types": "^15.6.2",