chore: use order_desc shared control consistently (#19172)

apache · Mar 18, 2022 · 10eb6c7 · 10eb6c7
1 parent b5e9fad
commit 10eb6c7
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 186 deletions.
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -43,6 +43,7 @@ import {
  SequentialScheme,
  legacyValidateInteger,
  validateNonEmpty,
+ JsonArray,
 } from '@superset-ui/core';
 
 import {
@@ -345,7 +346,10 @@ const order_desc: SharedControlConfig<'CheckboxControl'> = {
  default: true,
  description: t('Whether to sort descending or ascending'),
  visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
+ Boolean(
+ controls?.timeseries_limit_metric.value &&
+ (controls?.timeseries_limit_metric.value as JsonArray).length,
+ ),
 };
 
 const limit: SharedControlConfig<'SelectControl'> = {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts
@@ -34,18 +34,8 @@ const config: ControlPanelConfig = {
  ['adhoc_filters'],
  ['groupby'],
  ['limit', 'timeseries_limit_metric'],
+ ['order_desc'],
  [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
  {
  name: 'contribution',
  config: {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/src/controlPanel.ts
@@ -37,18 +37,8 @@ const config: ControlPanelConfig = {
  },
  ],
  ['limit', 'timeseries_limit_metric'],
+ ['order_desc'],
  [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
  {
  name: 'contribution',
  config: {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/controlPanel.ts
@@ -32,19 +32,7 @@ const config: ControlPanelConfig = {
  ['adhoc_filters'],
  ['limit', 'row_limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ],
  },
  {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx b/superset-frontend/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx
@@ -40,18 +40,8 @@ const config: ControlPanelConfig = {
  ['adhoc_filters'],
  ['groupby'],
  ['limit', 'timeseries_limit_metric'],
+ ['order_desc'],
  [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
  {
  name: 'contribution',
  config: {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts
@@ -39,19 +39,7 @@ const config: ControlPanelConfig = {
  ['columns'],
  ['row_limit', null],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ],
  },
  {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx b/superset-frontend/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx
@@ -38,18 +38,8 @@ const config: ControlPanelConfig = {
  ['adhoc_filters'],
  ['groupby'],
  ['limit', 'timeseries_limit_metric'],
+ ['order_desc'],
  [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
  {
  name: 'contribution',
  config: {

diff --git a/superset-frontend/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts
@@ -36,19 +36,7 @@ const config: ControlPanelConfig = {
  ['groupby'],
  ['row_limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ],
  },
  {

diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts b/superset-frontend/plugins/legacy-preset-chart-nvd3/src/DistBar/controlPanel.ts
@@ -51,19 +51,7 @@ const config: ControlPanelConfig = {
  ['columns'],
  ['row_limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  [
  {
  name: 'contribution',

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
@@ -83,19 +83,7 @@ const config: ControlPanelConfig = {
  emitFilterControl,
  ['limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ['row_limit'],
  ],
  },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
@@ -80,19 +80,7 @@ const config: ControlPanelConfig = {
  emitFilterControl,
  ['limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ['row_limit'],
  ],
  },

diff --git a/...set-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx b/...set-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
@@ -60,19 +60,7 @@ const config: ControlPanelConfig = {
  emitFilterControl,
  ['limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ['row_limit'],
  ],
  },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/controlPanel.tsx
@@ -77,19 +77,7 @@ const config: ControlPanelConfig = {
  emitFilterControl,
  ['limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ['row_limit'],
  ],
  },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
@@ -83,19 +83,7 @@ const config: ControlPanelConfig = {
  emitFilterControl,
  ['limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ['row_limit'],
  ],
  },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/controlPanel.tsx
@@ -84,19 +84,7 @@ const config: ControlPanelConfig = {
  emitFilterControl,
  ['limit'],
  ['timeseries_limit_metric'],
- [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort Descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
- ],
+ ['order_desc'],
  ['row_limit'],
  ],
  },

diff --git a/superset-frontend/src/explore/controlPanels/sections.tsx b/superset-frontend/src/explore/controlPanels/sections.tsx
@@ -108,18 +108,8 @@ export const NVD3TimeSeries: ControlPanelSectionConfig[] = [
  ['adhoc_filters'],
  ['groupby'],
  ['limit', 'timeseries_limit_metric'],
+ ['order_desc'],
  [
- {
- name: 'order_desc',
- config: {
- type: 'CheckboxControl',
- label: t('Sort descending'),
- default: true,
- description: t('Whether to sort descending or ascending'),
- visibility: ({ controls }) =>
- Boolean(controls?.timeseries_limit_metric.value),
- },
- },
  {
  name: 'contribution',
  config: {