This is an automated email from the ASF dual-hosted git repository. villebro pushed a commit to branch jb/feat-plugin-handlebars in repository https://gitbox.apache.org/repos/asf/superset.git
commit 3b227f8925b94dd661bca9728a8d9d06151b802a Author: Ville Brofeldt <[email protected]> AuthorDate: Tue Apr 5 10:37:29 2022 +0300 camelCase controls --- .../src/plugin/controlPanel.tsx | 52 +++++++++++----------- .../src/plugin/controls/columns.tsx | 10 ++--- .../src/plugin/controls/groupBy.tsx | 2 +- .../src/plugin/controls/handlebarTemplate.tsx | 2 +- .../src/plugin/controls/includeTime.ts | 2 +- .../src/plugin/controls/limits.ts | 4 +- .../src/plugin/controls/metrics.tsx | 16 +++---- .../src/plugin/controls/orderBy.tsx | 4 +- .../src/plugin/controls/pagination.tsx | 4 +- .../src/plugin/controls/queryMode.tsx | 2 +- .../src/plugin/controls/style.tsx | 2 +- 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx index 328ea57c05..32b3a55a79 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controlPanel.tsx @@ -23,29 +23,29 @@ import { } from '@superset-ui/chart-controls'; import { addLocaleData, t } from '@superset-ui/core'; import i18n from '../i18n'; -import { AllColumnsControlSetItem } from './controls/columns'; -import { GroupByControlSetItem } from './controls/groupBy'; -import { HandlebarsTemplateControlSetItem } from './controls/handlebarTemplate'; -import { IncludeTimeControlSetItem } from './controls/includeTime'; +import { allColumnsControlSetItem } from './controls/columns'; +import { groupByControlSetItem } from './controls/groupBy'; +import { handlebarsTemplateControlSetItem } from './controls/handlebarTemplate'; +import { includeTimeControlSetItem } from './controls/includeTime'; import { - RowLimitControlSetItem, - TimeSeriesLimitMetricControlSetItem, + rowLimitControlSetItem, + timeSeriesLimitMetricControlSetItem, } from './controls/limits'; import { - MetricsControlSetItem, - PercentMetricsControlSetItem, - ShowTotalsControlSetItem, + metricsControlSetItem, + percentMetricsControlSetItem, + showTotalsControlSetItem, } from './controls/metrics'; import { - OrderByControlSetItem, - OrderDescendingControlSetItem, + orderByControlSetItem, + orderDescendingControlSetItem, } from './controls/orderBy'; import { - ServerPageLengthControlSetItem, - ServerPaginationControlSetRow, + serverPageLengthControlSetItem, + serverPaginationControlSetRow, } from './controls/pagination'; -import { QueryModeControlSetItem } from './controls/queryMode'; -import { StyleControlSetItem } from './controls/style'; +import { queryModeControlSetItem } from './controls/queryMode'; +import { styleControlSetItem } from './controls/style'; addLocaleData(i18n); @@ -131,15 +131,15 @@ const config: ControlPanelConfig = { label: t('Query'), expanded: true, controlSetRows: [ - [QueryModeControlSetItem], - [GroupByControlSetItem], - [MetricsControlSetItem, AllColumnsControlSetItem], - [PercentMetricsControlSetItem], - [TimeSeriesLimitMetricControlSetItem, OrderByControlSetItem], - ServerPaginationControlSetRow, - [RowLimitControlSetItem, ServerPageLengthControlSetItem], - [IncludeTimeControlSetItem, OrderDescendingControlSetItem], - [ShowTotalsControlSetItem], + [queryModeControlSetItem], + [groupByControlSetItem], + [metricsControlSetItem, allColumnsControlSetItem], + [percentMetricsControlSetItem], + [timeSeriesLimitMetricControlSetItem, orderByControlSetItem], + serverPaginationControlSetRow, + [rowLimitControlSetItem, serverPageLengthControlSetItem], + [includeTimeControlSetItem, orderDescendingControlSetItem], + [showTotalsControlSetItem], ['adhoc_filters'], emitFilterControl, ], @@ -148,8 +148,8 @@ const config: ControlPanelConfig = { label: t('Options'), expanded: true, controlSetRows: [ - [HandlebarsTemplateControlSetItem], - [StyleControlSetItem], + [handlebarsTemplateControlSetItem], + [styleControlSetItem], ], }, ], diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/columns.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/columns.tsx index 60dc573ddb..11cdb06bf7 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/columns.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/columns.tsx @@ -13,7 +13,7 @@ import { import React from 'react'; import { getQueryMode, isRawMode } from './shared'; -export const all_columns: typeof sharedControls.groupby = { +export const allColumns: typeof sharedControls.groupby = { type: 'SelectControl', label: t('Columns'), description: t('Columns to display'), @@ -36,7 +36,7 @@ export const all_columns: typeof sharedControls.groupby = { visibility: isRawMode, }; -export const dnd_all_columns: typeof sharedControls.groupby = { +const dndAllColumns: typeof sharedControls.groupby = { type: 'DndColumnSelect', label: t('Columns'), description: t('Columns to display'), @@ -59,9 +59,9 @@ export const dnd_all_columns: typeof sharedControls.groupby = { visibility: isRawMode, }; -export const AllColumnsControlSetItem: ControlSetItem = { +export const allColumnsControlSetItem: ControlSetItem = { name: 'all_columns', config: isFeatureEnabled(FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP) - ? dnd_all_columns - : all_columns, + ? dndAllColumns + : allColumns, }; diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/groupBy.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/groupBy.tsx index 5e27f911b7..7a2e7f54d1 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/groupBy.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/groupBy.tsx @@ -6,7 +6,7 @@ import { } from '@superset-ui/chart-controls'; import { isAggMode, validateAggControlValues } from './shared'; -export const GroupByControlSetItem: ControlSetItem = { +export const groupByControlSetItem: ControlSetItem = { name: 'groupby', override: { visibility: isAggMode, diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx index 6b9d49b3b5..9eab1da110 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/handlebarTemplate.tsx @@ -36,7 +36,7 @@ const HandlebarsTemplateControl = ( ); }; -export const HandlebarsTemplateControlSetItem: ControlSetItem = { +export const handlebarsTemplateControlSetItem: ControlSetItem = { name: 'handlebarsTemplate', config: { ...sharedControls.entity, diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/includeTime.ts b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/includeTime.ts index 8cbc377dd4..6e45cbc842 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/includeTime.ts +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/includeTime.ts @@ -2,7 +2,7 @@ import { ControlSetItem } from '@superset-ui/chart-controls'; import { t } from '@superset-ui/core'; import { isAggMode } from './shared'; -export const IncludeTimeControlSetItem: ControlSetItem = { +export const includeTimeControlSetItem: ControlSetItem = { name: 'include_time', config: { type: 'CheckboxControl', diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/limits.ts b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/limits.ts index 718268d097..5a1aa3d906 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/limits.ts +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/limits.ts @@ -4,7 +4,7 @@ import { } from '@superset-ui/chart-controls'; import { isAggMode } from './shared'; -export const RowLimitControlSetItem: ControlSetItem = { +export const rowLimitControlSetItem: ControlSetItem = { name: 'row_limit', override: { visibility: ({ controls }: ControlPanelsContainerProps) => @@ -12,7 +12,7 @@ export const RowLimitControlSetItem: ControlSetItem = { }, }; -export const TimeSeriesLimitMetricControlSetItem: ControlSetItem = { +export const timeSeriesLimitMetricControlSetItem: ControlSetItem = { name: 'timeseries_limit_metric', override: { visibility: isAggMode, diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/metrics.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/metrics.tsx index cd85118641..44806d7aff 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/metrics.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/metrics.tsx @@ -7,7 +7,7 @@ import { import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core'; import { getQueryMode, isAggMode, validateAggControlValues } from './shared'; -const percent_metrics: typeof sharedControls.metrics = { +const percentMetrics: typeof sharedControls.metrics = { type: 'MetricsControl', label: t('Percentage metrics'), description: t( @@ -32,21 +32,21 @@ const percent_metrics: typeof sharedControls.metrics = { validators: [], }; -const dnd_percent_metrics = { - ...percent_metrics, +const dndPercentMetrics = { + ...percentMetrics, type: 'DndMetricSelect', }; -export const PercentMetricsControlSetItem: ControlSetItem = { +export const percentMetricsControlSetItem: ControlSetItem = { name: 'percent_metrics', config: { ...(isFeatureEnabled(FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP) - ? dnd_percent_metrics - : percent_metrics), + ? dndPercentMetrics + : percentMetrics), }, }; -export const MetricsControlSetItem: ControlSetItem = { +export const metricsControlSetItem: ControlSetItem = { name: 'metrics', override: { validators: [], @@ -71,7 +71,7 @@ export const MetricsControlSetItem: ControlSetItem = { }, }; -export const ShowTotalsControlSetItem: ControlSetItem = { +export const showTotalsControlSetItem: ControlSetItem = { name: 'show_totals', config: { type: 'CheckboxControl', diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/orderBy.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/orderBy.tsx index 70cc27fba0..37454ce57a 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/orderBy.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/orderBy.tsx @@ -2,7 +2,7 @@ import { ControlSetItem } from '@superset-ui/chart-controls'; import { t } from '@superset-ui/core'; import { isAggMode, isRawMode } from './shared'; -export const OrderByControlSetItem: ControlSetItem = { +export const orderByControlSetItem: ControlSetItem = { name: 'order_by_cols', config: { type: 'SelectControl', @@ -17,7 +17,7 @@ export const OrderByControlSetItem: ControlSetItem = { }, }; -export const OrderDescendingControlSetItem: ControlSetItem = { +export const orderDescendingControlSetItem: ControlSetItem = { name: 'order_desc', config: { type: 'CheckboxControl', diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx index e4db1ba7b4..0b0144574b 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/pagination.tsx @@ -6,7 +6,7 @@ import { import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core'; import { PAGE_SIZE_OPTIONS } from '../../consts'; -export const ServerPaginationControlSetRow: ControlSetRow = +export const serverPaginationControlSetRow: ControlSetRow = isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) || isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) ? [ @@ -24,7 +24,7 @@ export const ServerPaginationControlSetRow: ControlSetRow = ] : []; -export const ServerPageLengthControlSetItem: ControlSetItem = { +export const serverPageLengthControlSetItem: ControlSetItem = { name: 'server_page_length', config: { type: 'SelectControl', diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/queryMode.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/queryMode.tsx index 0646195a34..a97d6e4682 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/queryMode.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/queryMode.tsx @@ -18,7 +18,7 @@ const queryMode: ControlConfig<'RadioButtonControl'> = { rerender: ['all_columns', 'groupby', 'metrics', 'percent_metrics'], }; -export const QueryModeControlSetItem: ControlSetItem = { +export const queryModeControlSetItem: ControlSetItem = { name: 'query_mode', config: queryMode, }; diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx index 04487a8094..8d80fc187e 100644 --- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx +++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx @@ -35,7 +35,7 @@ const StyleControl = (props: CustomControlConfig<StyleCustomControlProps>) => { ); }; -export const StyleControlSetItem: ControlSetItem = { +export const styleControlSetItem: ControlSetItem = { name: 'styleTemplate', config: { ...sharedControls.entity,
